Makes build.xml take into account OS arch when constructing LD_LIBRARY_PATH. Patch from Werner Dittmann

build.xml

@@ -83,7 +83,18 @@
 
     <condition property="ld.library.path"
               value="${lib}/native/linux:${system.LD_LIBRARY_PATH}">
-        <isset property="is.running.linux"/>
+        <and>
+            <isset property="is.running.linux"/>
+            <os arch="x86" />
+        </and>
+    </condition>
+
+    <condition property="ld.library.path"
+              value="${lib}/native/linux-64:${system.LD_LIBRARY_PATH}">
+        <and>
+            <isset property="is.running.linux"/>
+            <os arch="amd64" />
+        </and>
     </condition>
 
     <condition property="bundles.dest.os" value="${bundles.dest.lin}">
@@ -139,7 +150,7 @@
     <!-- end jmf.home-->
 
     <property name="jdic_stub.jar" value="${os.lib.home}/jdic_stub.jar"/>
-	
+
     <property name="profiler.args" value="" />
     <property name="profiler.bootdelegation" value="" />
     <property name="profiler.autostart" value="" />
@@ -598,23 +609,23 @@
     <!--RUN-SIP-COMMUNICATOR-WITH-INTEGRATED-PROFILER -->
     <target name="run-with-profiler"
         description="Starts felix and runs sip-comunicator gui (use latest build) with the hooked classloader."
-    	depends="bundle-plugin-profiler4j">
+        depends="bundle-plugin-profiler4j">
 
-    	<antcall target="run">
+        <antcall target="run">
             <param name="profiler.args"
                 value="-Xmx128m -javaagent:${lib.noinst}/profiler4j-1.0-beta3-SC.jar" />
             <param name="profiler.bootdelegation"
                 value="net.sf.profiler4j.agent.*" />
             <param name="profiler.autostart"
                 value="reference:file:sc-bundles/profiler4j.jar" />
-    	</antcall>
+        </antcall>
     </target>
-	    
+
     <!--PROFILE-SIP-COMMUNICATOR-IN-NETBEANS-IDE -->
-    <target name="profile" depends="bundle-plugin-profiler4j,-deploy-os-specific-bundles" 
-    	description="Profile Project">
+    <target name="profile" depends="bundle-plugin-profiler4j,-deploy-os-specific-bundles"
+        description="Profile Project">
         <fail unless="netbeans.home">
-        	This target can only run inside the NetBeans IDE.
+            This target can only run inside the NetBeans IDE.
         </fail>
 
         <nbprofiledirect>
@@ -625,7 +636,7 @@
             fork="true"
             failonerror="true"
             classpathref="project.class.path">
-                    
+
             <jvmarg value="${profiler.info.jvmargs.agent}"/>
 
             <!-- Tell felix to run sip-communicator-->
@@ -655,12 +666,12 @@
             <env key="LD_LIBRARY_PATH" path="${ld.library.path}"/>
             <env key="PATH" path="${path}"/>
             <env key="DYLD_LIBRARY_PATH" path="${dyld.library.path}"/>
-            
+
         </java>
-        
-        <delete file="${bundles.dest}/profiler4j.jar"/>    	
+
+        <delete file="${bundles.dest}/profiler4j.jar"/>
     </target>
-	
+
     <!-- we run this target before we run SC in order to copy os-specific
              bundles from sc-bundles/osname to its parent sc-bundles-->
     <target name="-deploy-os-specific-bundles" if="bundles.dest.os">
@@ -1664,20 +1675,20 @@ javax.swing.event, javax.swing.border"/>
                 prefix="net/java/sip/communicator/plugin/autoaway" />
         </jar>
     </target>
-	
+
    <!--BUNDLE-PLUGIN-PROFILER-->
    <target name="bundle-plugin-profiler4j">
         <jar compress="false" destfile="${bundles.dest}/profiler4j.jar"
             manifest="${src}/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/profiler4j"
                 prefix="net/java/sip/communicator/plugin/profiler4j" />
-            <zipfileset src="${lib.noinst}/profiler4j-1.0-beta3-SC.jar" 
-            	prefix=""/>
+            <zipfileset src="${lib.noinst}/profiler4j-1.0-beta3-SC.jar"
+                prefix=""/>
             <zipfileset src="${lib.noinst}/jdom.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/jcommon-1.0.0.jar" prefix=""/>
-        	<zipfileset src="${lib.noinst}/commons-logging.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/commons-logging.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/jfreechart-1.0.1.jar" prefix=""/>
-        	<fileset file="${lib.noinst}/p4j-exclusions.txt"/>
+            <fileset file="${lib.noinst}/p4j-exclusions.txt"/>
         </jar>
     </target>
 

src/net/java/sip/communicator/impl/protocol/sip/security/MessageDigestAlgorithm.java

@@ -27,21 +27,21 @@ public class MessageDigestAlgorithm
      * @param algorithm a string indicating a pair of algorithms (MD5 (default),
      * or MD5-sess) used to produce the digest and a checksum.
      * @param username_value username_value (see rfc2617)
-     * @param realm_value A string that has been displayed to the user in order 
+     * @param realm_value A string that has been displayed to the user in order
      * to determine the context of the username and password to use.
      * @param passwd the password to encode in the challenge response.
-     * @param nonce_value A server-specified data string provided in the 
+     * @param nonce_value A server-specified data string provided in the
      * challenge.
      * @param cnonce_value an optional  client-chosen value whose purpose is
      * to foil chosen plaintext attacks.
      * @param method the SIP method of the request being challenged.
-     * @param digest_uri_value the value of the "uri" directive on the 
+     * @param digest_uri_value the value of the "uri" directive on the
      * Authorization header in the request.
      * @param entity_body the entity-body
-     * @param qop_value Indicates what "quality of protection" the client has 
+     * @param qop_value Indicates what "quality of protection" the client has
      * applied to the message.
-     * @param nc_value  the hexadecimal count of the number of requests 
-     * (including the current request) that the client has sent with the nonce 
+     * @param nc_value  the hexadecimal count of the number of requests
+     * (including the current request) that the client has sent with the nonce
      * value in this request.
      * @return a digest response as defined in rfc2617
      * @throws NullPointerException in case of incorrectly null parameters.
@@ -58,12 +58,12 @@ static String calculateResponse(String algorithm,
                                     String entity_body,
                                     String qop_value)
     {
-    	logger.debug("trying to authenticate using : " + algorithm + ", "
-    			+ username_value + ", " + realm_value + ", " + (passwd != null
-				&& passwd.trim().length() > 0) + ", " + nonce_value + ", "
-				+ nc_value + ", " + cnonce_value + ", " + method + ", "
-				+ digest_uri_value + ", " + entity_body + ", " + qop_value); 
-    	
+        logger.debug("trying to authenticate using : " + algorithm + ", "
+                + username_value + ", " + realm_value + ", " + (passwd != null
+                && passwd.trim().length() > 0) + ", " + nonce_value + ", "
+                + nc_value + ", " + cnonce_value + ", " + method + ", "
+                + digest_uri_value + ", " + entity_body + ", " + qop_value);
+
         if (username_value == null || realm_value == null || passwd == null
             || method == null || digest_uri_value == null || nonce_value == null)
             throw new NullPointerException(
@@ -104,10 +104,10 @@ static String calculateResponse(String algorithm,
 
         String request_digest = null;
 
-        if( cnonce_value != null 
-            && qop_value != null 
+        if( cnonce_value != null
+            && qop_value != null
             && nc_value!=null
-            && (qop_value.equalsIgnoreCase("auth") 
+            && (qop_value.equalsIgnoreCase("auth")
                 || qop_value.equalsIgnoreCase("auth-int")))
 
         {