2005-01-05 jrandom

* Handle unexpected network read errors more carefully (thanks parg!)
    * Added more methods to partially compare (DataHelper) and display
      arrays (Base64.encode).
    * Exposed the AES encryptBlock/decryptBlock on the context.aes()
    * Be more generous on the throttle when just starting up the router
    * Fix a missing scheduled event in the streaming lib (caused after reset)
    * Add a new DisconnectListener on the I2PSocketManager to allow
      notification of session destruction.
    * Make sure our own router identity is valid, and if it isn't, build a new
      one and restart the router.  Alternately, you can run the Router with
      the single command line argument "rebuild" and it will do the same.

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

@@ -127,6 +127,21 @@ public class AESEngine {
         _log.warn("Warning: AES is disabled");
     }
 
+    
+    public void encryptBlock(byte payload[], int inIndex, SessionKey sessionKey, byte out[], int outIndex) {
+        System.arraycopy(payload, inIndex, out, outIndex, out.length - outIndex);
+    }
+
+    /** decrypt the data with the session key provided
+     * @param payload encrypted data
+     * @param sessionKey private session key
+     * @return unencrypted data
+     */
+    public void decryptBlock(byte payload[], int inIndex, SessionKey sessionKey, byte rv[], int outIndex) {
+        System.arraycopy(payload, inIndex, rv, outIndex, rv.length - outIndex);
+    }
+    
+    
     public static void main(String args[]) {
         I2PAppContext ctx = new I2PAppContext();
         SessionKey key = ctx.keyGenerator().generateSessionKey();

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

@@ -161,7 +161,7 @@ public class AESInputStream extends FilterInputStream {
      *
      */
     private void refill() throws IOException {
-        if (!_eofFound) {
+        if ( (!_eofFound) && (_writesSinceDecrypt < BLOCK_SIZE) ) {
             int read = in.read(_encryptedBuf, _writesSinceDecrypt, _encryptedBuf.length - _writesSinceDecrypt);
             if (read == -1) {
                 _eofFound = true;

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

@@ -85,14 +85,14 @@ public class CryptixAESEngine extends AESEngine {
         if (length % 16 != 0) numblock++;
 
         decryptBlock(payload, payloadIndex, sessionKey, out, outIndex);
-		DataHelper.xor(out, outIndex, iv, 0, out, outIndex, 16);
+        DataHelper.xor(out, outIndex, iv, 0, out, outIndex, 16);
         for (int x = 1; x < numblock; x++) {
             decryptBlock(payload, payloadIndex + (x * 16), sessionKey, out, outIndex + (x * 16));
             DataHelper.xor(out, outIndex + x * 16, payload, payloadIndex + (x - 1) * 16, out, outIndex + x * 16, 16);
         }
     }
 
-    final void encryptBlock(byte payload[], int inIndex, SessionKey sessionKey, byte out[], int outIndex) {
+    public final void encryptBlock(byte payload[], int inIndex, SessionKey sessionKey, byte out[], int outIndex) {
         CryptixAESKeyCache.KeyCacheEntry keyData = _cache.acquireKey();
         try {
             Object key = CryptixRijndael_Algorithm.makeKey(sessionKey.getData(), 16, keyData);
@@ -109,7 +109,7 @@ public class CryptixAESEngine extends AESEngine {
      * @param sessionKey private session key
      * @return unencrypted data
      */
-    final void decryptBlock(byte payload[], int inIndex, SessionKey sessionKey, byte rv[], int outIndex) {
+    public final void decryptBlock(byte payload[], int inIndex, SessionKey sessionKey, byte rv[], int outIndex) {
         if ( (payload == null) || (rv == null) )
             throw new IllegalArgumentException("null block args [payload=" + payload + " rv="+rv);
         if (payload.length - inIndex > rv.length - outIndex)
@@ -131,9 +131,11 @@ public class CryptixAESEngine extends AESEngine {
         I2PAppContext ctx = new I2PAppContext();
         try {
             testEDBlock(ctx);
+            testEDBlock2(ctx);
             testED(ctx);
-            testFake(ctx);
-            testNull(ctx);
+            testED2(ctx);
+            //testFake(ctx);
+            //testNull(ctx);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -155,6 +157,21 @@ public class CryptixAESEngine extends AESEngine {
         else
             System.out.println("full D(E(orig)) == orig");
     }
+    private static void testED2(I2PAppContext ctx) {
+        SessionKey key = ctx.keyGenerator().generateSessionKey();
+        byte iv[] = new byte[16];
+        byte orig[] = new byte[128];
+        byte data[] = new byte[128];
+        ctx.random().nextBytes(iv);
+        ctx.random().nextBytes(orig);
+        CryptixAESEngine aes = new CryptixAESEngine(ctx);
+        aes.encrypt(orig, 0, data, 0, key, iv, data.length);
+        aes.decrypt(data, 0, data, 0, key, iv, data.length);
+        if (!DataHelper.eq(data,orig))
+            throw new RuntimeException("full D(E(orig)) != orig");
+        else
+            System.out.println("full D(E(orig)) == orig");
+    }
     private static void testFake(I2PAppContext ctx) {
         SessionKey key = ctx.keyGenerator().generateSessionKey();
         SessionKey wrongKey = ctx.keyGenerator().generateSessionKey();
@@ -207,4 +224,19 @@ public class CryptixAESEngine extends AESEngine {
         else
             System.out.println("block D(E(orig)) == orig");
     }
+    private static void testEDBlock2(I2PAppContext ctx) {
+        SessionKey key = ctx.keyGenerator().generateSessionKey();
+        byte iv[] = new byte[16];
+        byte orig[] = new byte[16];
+        byte data[] = new byte[16];
+        ctx.random().nextBytes(iv);
+        ctx.random().nextBytes(orig);
+        CryptixAESEngine aes = new CryptixAESEngine(ctx);
+        aes.encryptBlock(orig, 0, key, data, 0);
+        aes.decryptBlock(data, 0, key, data, 0);
+        if (!DataHelper.eq(data,orig))
+            throw new RuntimeException("block D(E(orig)) != orig");
+        else
+            System.out.println("block D(E(orig)) == orig");
+    }
 }

core/java/src/net/i2p/data/Base64.java

@@ -43,10 +43,16 @@ public class Base64 {
     private final static Log _log = new Log(Base64.class);
 
     public static String encode(byte[] source) {
-        return encode(source, false);
+        return encode(source, 0, (source != null ? source.length : 0));
+    }
+    public static String encode(byte[] source, int off, int len) {
+        return encode(source, off, len, false);
     }
     public static String encode(byte[] source, boolean useStandardAlphabet) {
-        return safeEncode(source, useStandardAlphabet);
+        return encode(source, 0, (source != null ? source.length : 0), useStandardAlphabet);
+    }
+    public static String encode(byte[] source, int off, int len, boolean useStandardAlphabet) {
+        return safeEncode(source, off, len, useStandardAlphabet);
     }
 
     public static byte[] decode(String s) {
@@ -318,8 +324,8 @@ public class Base64 {
      * Same as encodeBytes, except uses a filesystem / URL friendly set of characters,
      * replacing / with ~, and + with -
      */
-    private static String safeEncode(byte[] source, boolean useStandardAlphabet) {
-        String encoded = encodeBytes(source);
+    private static String safeEncode(byte[] source, int off, int len, boolean useStandardAlphabet) {
+        String encoded = encodeBytes(source, off, len, false);
         if (useStandardAlphabet) {
             // noop
         } else {

core/java/src/net/i2p/data/DataHelper.java

@@ -559,6 +559,16 @@ public class DataHelper {
         return lhs == rhs;
     }
 
+    public final static boolean eq(byte lhs[], int offsetLeft, byte rhs[], int offsetRight, int length) {
+        if ( (lhs == null) || (rhs == null) ) return false;
+        if (length <= 0) return true;
+        for (int i = 0; i < length; i++) {
+            if (lhs[offsetLeft + i] != rhs[offsetRight + i]) 
+                return false;
+        }
+        return true;
+    }
+    
     public final static int compareTo(byte lhs[], byte rhs[]) {
         if ((rhs == null) && (lhs == null)) return 0;
         if (lhs == null) return -1;

core/java/src/net/i2p/data/Payload.java

@@ -69,6 +69,7 @@ public class Payload extends DataStructureImpl {
 
     public void readBytes(InputStream in) throws DataFormatException, IOException {
         int size = (int) DataHelper.readLong(in, 4);
+        if (size < 0) throw new DataFormatException("payload size out of range (" + size + ")");
         _encryptedData = new byte[size];
         int read = read(in, _encryptedData);
         if (read != size) throw new DataFormatException("Incorrect number of bytes read in the payload structure");