(32);
+ }
+
+ /**
+ * Calculate the HMAC of the data with the given key
+ *
+ * @param target out parameter the first 16 bytes contain the HMAC, the last 16 bytes are zero
+ * @param targetOffset offset into target to put the hmac
+ * @throws IllegalArgumentException for bad key or target too small
+ */
+ public void calculate(SessionKey key, byte data[], int offset, int length, byte target[], int targetOffset) {
+ if ((key == null) || (key.getData() == null) || (data == null))
+ throw new NullPointerException("Null arguments for HMAC");
+
+ I2PHMac mac = acquire();
+ mac.init(key.getData());
+ mac.update(data, offset, length);
+ mac.doFinal(target, targetOffset);
+ release(mac);
+ }
+
+ /**
+ * Verify the MAC inline, reducing some unnecessary memory churn.
+ *
+ * @param key session key to verify the MAC with
+ * @param curData MAC to verify
+ * @param curOffset index into curData to MAC
+ * @param curLength how much data in curData do we want to run the HMAC over
+ * @param origMAC what do we expect the MAC of curData to equal
+ * @param origMACOffset index into origMAC
+ * @param origMACLength how much of the MAC do we want to verify
+ * @throws IllegalArgumentException for bad key
+ */
+ public boolean verify(SessionKey key, byte curData[], int curOffset, int curLength,
+ byte origMAC[], int origMACOffset, int origMACLength) {
+ if ((key == null) || (key.getData() == null) || (curData == null))
+ throw new NullPointerException("Null arguments for HMAC");
+
+ I2PHMac mac = acquire();
+ mac.init(key.getData());
+ mac.update(curData, curOffset, curLength);
+ byte rv[] = acquireTmp();
+ mac.doFinal(rv, 0);
+ release(mac);
+
+ boolean eq = DataHelper.eqCT(rv, 0, origMAC, origMACOffset, origMACLength);
+ releaseTmp(rv);
+ return eq;
+ }
+
+ private I2PHMac acquire() {
+ I2PHMac rv = _available.poll();
+ if (rv != null)
+ return rv;
+ // the HMAC is hardcoded to use SHA256 digest size
+ // for backwards compatability. next time we have a backwards
+ // incompatible change, we should update this by removing ", 32"
+ // SEE NOTES ABOVE
+ try {
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ return new I2PHMac(md, 32);
+ } catch (NoSuchAlgorithmException nsae) {
+ throw new UnsupportedOperationException("MD5");
+ }
+ }
+
+ private void release(I2PHMac mac) {
+ _available.offer(mac);
+ }
+
+ /**
+ * @since 0.9.42
+ */
+ public void clearCache() {
+ _available.clear();
+ }
+
+ //private static final int RUNS = 100000;
+
+ /**
+ * Test the BC and the JVM's implementations for speed
+ */
+/**** All this did was prove that we aren't compatible with standard HmacMD5
+ public static void main(String args[]) {
+ if (args.length != 2) {
+ System.err.println("Usage: HMACGenerator keySeedString dataString");
+ return;
+ }
+
+ byte[] rand = SHA256Generator.getInstance().calculateHash(args[0].getBytes()).getData();
+ byte[] data = args[1].getBytes();
+ Key keyObj = new SecretKeySpec(rand, "HmacMD5");
+
+ byte[] keyBytes = keyObj.getEncoded();
+ System.out.println("key bytes (" + keyBytes.length + ") is [" + Base64.encode(keyBytes) + "]");
+ SessionKey key = new SessionKey(keyBytes);
+ System.out.println("session key is [" + key);
+ System.out.println("key object is [" + keyObj);
+
+ HMACGenerator gen = new HMACGenerator(I2PAppContext.getGlobalContext());
+ byte[] result = new byte[16];
+ long start = System.currentTimeMillis();
+ for (int i = 0; i < RUNS; i++) {
+ gen.calculate(key, data, 0, data.length, result, 0);
+ if (i == 0)
+ System.out.println("MAC [" + Base64.encode(result) + "]");
+ }
+ long time = System.currentTimeMillis() - start;
+ System.out.println("Time for " + RUNS + " HMAC-MD5 computations:");
+ System.out.println("BC time (ms): " + time);
+
+ start = System.currentTimeMillis();
+ javax.crypto.Mac mac;
+ try {
+ mac = javax.crypto.Mac.getInstance("HmacMD5");
+ } catch (NoSuchAlgorithmException e) {
+ System.err.println("Fatal: " + e);
+ return;
+ }
+ for (int i = 0; i < RUNS; i++) {
+ try {
+ mac.init(keyObj);
+ } catch (InvalidKeyException e) {
+ System.err.println("Fatal: " + e);
+ }
+ byte[] sha = mac.doFinal(data);
+ if (i == 0)
+ System.out.println("MAC [" + Base64.encode(sha) + "]");
+ }
+ time = System.currentTimeMillis() - start;
+
+ System.out.println("JVM time (ms): " + time);
+ }
+****/
+}
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
index 1eeb4e0916..86c4055a21 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
@@ -6,6 +6,7 @@ import java.util.Arrays;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
+import net.i2p.crypto.HMACGenerator;
import net.i2p.data.Base64;
import net.i2p.data.DataHelper;
import net.i2p.data.SessionKey;
@@ -225,7 +226,7 @@ class UDPPacket implements CDQEntry {
* MAC matches, false otherwise.
*
*/
- public synchronized boolean validate(SessionKey macKey) {
+ public synchronized boolean validate(SessionKey macKey, HMACGenerator hmac) {
verifyNotReleased();
//_beforeValidate = _context.clock().now();
boolean eq = false;
@@ -244,14 +245,14 @@ class UDPPacket implements CDQEntry {
DataHelper.toLong(_validateBuf, off, 2, payloadLength /* ^ PacketBuilder.PROTOCOL_VERSION */ );
off += 2;
- eq = _context.hmac().verify(macKey, _validateBuf, 0, off, _data, _packet.getOffset(), MAC_SIZE);
+ eq = hmac.verify(macKey, _validateBuf, 0, off, _data, _packet.getOffset(), MAC_SIZE);
if (!eq) {
// this is relatively frequent, as you can get old keys in PacketHandler.
Log log = _context.logManager().getLog(UDPPacket.class);
if (log.shouldLog(Log.INFO)) {
byte[] calc = new byte[32];
- _context.hmac().calculate(macKey, _validateBuf, 0, off, calc, 0);
+ hmac.calculate(macKey, _validateBuf, 0, off, calc, 0);
StringBuilder str = new StringBuilder(512);
str.append("Bad HMAC:\n\t");
str.append(_packet.getLength()).append(" byte pkt, ");
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index a73429831b..6407dc9b5d 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import net.i2p.crypto.HMACGenerator;
import net.i2p.crypto.SigType;
import net.i2p.data.DatabaseEntry;
import net.i2p.data.DataHelper;
@@ -87,6 +88,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
private long _introducersSelectedOn;
private long _lastInboundReceivedOn;
private final DHSessionKeyBuilder.Factory _dhFactory;
+ private final SSUHMACGenerator _hmac;
private int _mtu;
private int _mtu_ipv6;
private boolean _mismatchLogged;
@@ -272,6 +274,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
_introManager = new IntroductionManager(_context, this);
_introducersSelectedOn = -1;
_lastInboundReceivedOn = -1;
+ _hmac = new SSUHMACGenerator();
_mtu = PeerState.LARGE_MTU;
_mtu_ipv6 = PeerState.MIN_IPV6_MTU;
setupPort();
@@ -614,6 +617,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
UDPPacket.clearCache();
UDPAddress.clearCache();
_lastInboundIPv6 = 0;
+ _hmac.clearCache();
}
/**
@@ -2748,6 +2752,14 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
return _dhFactory;
}
+ /**
+ * @return the SSU HMAC
+ * @since 0.9.42
+ */
+ HMACGenerator getHMAC() {
+ return _hmac;
+ }
+
/**
* Does nothing
* @deprecated as of 0.9.31
diff --git a/core/java/src/org/bouncycastle/oldcrypto/Mac.java b/router/java/src/org/bouncycastle/oldcrypto/Mac.java
similarity index 98%
rename from core/java/src/org/bouncycastle/oldcrypto/Mac.java
rename to router/java/src/org/bouncycastle/oldcrypto/Mac.java
index aa3f7605fb..a55c19959e 100644
--- a/core/java/src/org/bouncycastle/oldcrypto/Mac.java
+++ b/router/java/src/org/bouncycastle/oldcrypto/Mac.java
@@ -31,6 +31,8 @@ package org.bouncycastle.oldcrypto;
* The base interface for implementations of message authentication codes (MACs).
*
* modified by jrandom to use the session key byte array directly
+ *
+ * Not a public API - Not for external use!
*/
public interface Mac
{
diff --git a/core/java/src/org/bouncycastle/oldcrypto/macs/I2PHMac.java b/router/java/src/org/bouncycastle/oldcrypto/macs/I2PHMac.java
similarity index 99%
rename from core/java/src/org/bouncycastle/oldcrypto/macs/I2PHMac.java
rename to router/java/src/org/bouncycastle/oldcrypto/macs/I2PHMac.java
index e39ef42781..646f8329e1 100644
--- a/core/java/src/org/bouncycastle/oldcrypto/macs/I2PHMac.java
+++ b/router/java/src/org/bouncycastle/oldcrypto/macs/I2PHMac.java
@@ -51,7 +51,7 @@ import org.bouncycastle.oldcrypto.Mac;
* As of 0.9.12, refactored to use standard MessageDigest.
*
* Deprecated - Do not use outside of router or Syndie.
- * To be moved to router.
+ * Not a public API - Not for external use!
*/
public class I2PHMac
implements Mac
diff --git a/core/java/src/org/bouncycastle/oldcrypto/macs/package.html b/router/java/src/org/bouncycastle/oldcrypto/macs/package.html
similarity index 86%
rename from core/java/src/org/bouncycastle/oldcrypto/macs/package.html
rename to router/java/src/org/bouncycastle/oldcrypto/macs/package.html
index 56de5a3940..5b57a27104 100644
--- a/core/java/src/org/bouncycastle/oldcrypto/macs/package.html
+++ b/router/java/src/org/bouncycastle/oldcrypto/macs/package.html
@@ -9,6 +9,9 @@ To avoid having to make two different versions of our Android app, we rename to
Ref: javax.crypto
and
this android issue.
+
+Moved from i2p.jar to router.jar as of 0.9.42.
+Not a public API! Not for external use!