merge of '3f85581f65aedde0f96729d197aaab223174f2e4'

and '6df9f4e154d148867ee158cbe9e9acf3fb73d680'

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

@@ -598,7 +598,6 @@ public class DSAEngine {
     private Signature altSignRaw(SimpleDataStructure hash, SigningPrivateKey privateKey) throws GeneralSecurityException {
         SigType type = privateKey.getType();
         String algo = getRawAlgo(type);
-        java.security.Signature jsig = java.security.Signature.getInstance(algo);
         PrivateKey privKey = SigUtil.toJavaKey(privateKey);
         return altSignRaw(algo, hash, privKey, type);
     }

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

@@ -175,7 +175,6 @@ class SigUtil {
                               throws GeneralSecurityException {
         SigType type = pk.getType();
         int len = type.getPubkeyLen();
-        int sublen = len / 2;
         byte[] b = pk.getData();
         BigInteger s = new NativeBigInteger(1, b);
         // see ECConstants re: casting

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

@@ -113,7 +113,7 @@ public class Clock implements Timestamper.UpdateListener {
     /*
      * @return the current delta from System.currentTimeMillis() in milliseconds
      */
-    public long getOffset() {
+    public synchronized long getOffset() {
         return _offset;
     }
     

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

@@ -149,7 +149,7 @@ public class SimpleTimer {
             }
             // FIXME if you plan to use this class again
             while (_events.containsKey(time))
-                time = new Long(time.longValue() + 1);
+                time = Long.valueOf(time.longValue() + 1);
             _events.put(time, event);
             _eventTimes.put(event, time);