merge of '71a5174ccd130a08639b5c4a72382975747c7b43'

     and '9591822ae7297e11b8efacb8456758babb1c6505'

core/java/src/net/i2p/crypto/HMAC256Generator.java

@@ -13,7 +13,7 @@ import org.bouncycastle.crypto.macs.I2PHMac;
 /**
  * Calculate the HMAC-SHA256 of a key+message.  All the good stuff occurs
  * in {@link org.bouncycastle.crypto.macs.I2PHMac} and 
- * {@link net.i2p.crypto.Sha256Standalone}.
+ * {@link gnu.crypto.hash.Sha256Standalone}.
  *
  * This should be compatible with javax.crypto.Mac.getInstance("HmacSHA256")
  * but that is untested.

core/java/src/net/i2p/util/NativeBigInteger.java

@@ -179,17 +179,6 @@ public class NativeBigInteger extends BigInteger {
       * @return A string containing the CPU-type or null if CPU type is unknown
       */
     private static String resolveCPUType() {
-        if (_is64) {
-            // Test the 64 bit libjcpuid, even though we don't use it yet
-            try {
-                CPUInfo c = CPUID.getInfo();
-                _cpuModel = c.getCPUModelString();
-            } catch (UnknownCPUException e) {
-                // log?
-            }
-            return JBIGI_OPTIMIZATION_ATHLON64;
-        }
-        
         try {
             CPUInfo c = CPUID.getInfo();
             try {

history.txt

@@ -22,6 +22,7 @@
         http://sponge.i2p/files/jbigi/gmp-4.3.2/
         The 4.3.2 files are half the size of those built with GMP 5.0.2, and there was
         little or no performance difference between the two versions for 32 bit processors.
+    * NBI: Enable 64-bit processor detection
     * Profiles: Skip and delete a corrupt profile read from disk
 
 2011-06-10 kytv

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 23;
+    public final static long BUILD = 24;
 
     /** for example "-test" */
     public final static String EXTRA = "";