From c4877ea092976ade0b941ed4bb19469577f6b5f1 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 6 May 2015 01:53:50 +0000 Subject: [PATCH] Crypto: Comment out Cryptix debug logging --- .../i2p/crypto/CryptixRijndael_Algorithm.java | 32 ++++++++++++++----- history.txt | 5 +++ .../src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java b/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java index f36d7753b..896036842 100644 --- a/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java +++ b/core/java/src/net/i2p/crypto/CryptixRijndael_Algorithm.java @@ -32,6 +32,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor // Debugging methods and variables //........................................................................... +/**** private static final String _NAME = "Rijndael_Algorithm"; private static final boolean _IN = true, _OUT = false; @@ -53,6 +54,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor private static void trace(String s) { if (_TRACE) _err.println("<=> " + _NAME + "." + s); } +****/ // Constants and variables //........................................................................... @@ -89,11 +91,13 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor //........................................................................... static { +/**** if (_RDEBUG && _debuglevel > 6) { System.out.println("Algorithm Name: Rijndael ver 0.1"); System.out.println("Electronic Codebook (ECB) Mode"); System.out.println(); } +****/ int ROOT = 0x11B; int i, j = 0; @@ -383,7 +387,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor * @param sessionKey The session key to use for encryption. */ public static final void blockEncrypt(byte[] in, byte[] result, int inOffset, int outOffset, Object sessionKey) { - if (_RDEBUG) trace(_IN, "blockEncrypt(" + in + ", " + inOffset + ", " + sessionKey + ")"); + //if (_RDEBUG) trace(_IN, "blockEncrypt(" + in + ", " + inOffset + ", " + sessionKey + ")"); int[][] Ke = (int[][]) ((Object[]) sessionKey)[0]; // extract encryption round keys int ROUNDS = Ke.length - 1; int[] Ker = Ke[0]; @@ -409,9 +413,11 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor t1 = a1; t2 = a2; t3 = a3; +/**** if (_RDEBUG && _debuglevel > 6) System.out.println("CT" + r + "=" + intToString(t0) + intToString(t1) + intToString(t2) + intToString(t3)); +****/ } // last round is special @@ -436,11 +442,13 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor result[outOffset++] = (byte) (_S[(t0 >>> 16) & 0xFF] ^ (tt >>> 16)); result[outOffset++] = (byte) (_S[(t1 >>> 8) & 0xFF] ^ (tt >>> 8)); result[outOffset++] = (byte) (_S[t2 & 0xFF] ^ tt); +/**** if (_RDEBUG && _debuglevel > 6) { System.out.println("CT=" + toString(result)); System.out.println(); } if (_RDEBUG) trace(_OUT, "blockEncrypt()"); +****/ } /** @@ -458,7 +466,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor + " result.len=" + result.length + " result.offset=" + outOffset); if (in.length - inOffset <= 15) throw new IllegalArgumentException("data too small: " + in.length + " inOffset: " + inOffset); - if (_RDEBUG) trace(_IN, "blockDecrypt(" + in + ", " + inOffset + ", " + sessionKey + ")"); + //if (_RDEBUG) trace(_IN, "blockDecrypt(" + in + ", " + inOffset + ", " + sessionKey + ")"); int[][] Kd = (int[][]) ((Object[]) sessionKey)[1]; // extract decryption round keys int ROUNDS = Kd.length - 1; int[] Kdr = Kd[0]; @@ -484,9 +492,11 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor t1 = a1; t2 = a2; t3 = a3; +/**** if (_RDEBUG && _debuglevel > 6) System.out.println("PT" + r + "=" + intToString(t0) + intToString(t1) + intToString(t2) + intToString(t3)); +****/ } // last round is special @@ -511,11 +521,13 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor result[outOffset++] = (byte) (_Si[(t2 >>> 16) & 0xFF] ^ (tt >>> 16)); result[outOffset++] = (byte) (_Si[(t1 >>> 8) & 0xFF] ^ (tt >>> 8)); result[outOffset++] = (byte) (_Si[t0 & 0xFF] ^ tt); +/**** if (_RDEBUG && _debuglevel > 6) { System.out.println("PT=" + toString(result)); System.out.println(); } if (_RDEBUG) trace(_OUT, "blockDecrypt()"); +****/ } /** A basic symmetric encryption/decryption test. */ @@ -544,7 +556,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor return makeKey(k, blockSize, null); } public static final/* synchronized */Object makeKey(byte[] k, int blockSize, CryptixAESKeyCache.KeyCacheEntry keyData) throws InvalidKeyException { - if (_RDEBUG) trace(_IN, "makeKey(" + k + ", " + blockSize + ")"); + //if (_RDEBUG) trace(_IN, "makeKey(" + k + ", " + blockSize + ")"); if (k == null) throw new InvalidKeyException("Empty key"); if (!(k.length == 16 || k.length == 24 || k.length == 32)) throw new InvalidKeyException("Incorrect key length"); @@ -629,7 +641,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor sessionKey = new Object[] { Ke, Kd}; else sessionKey = keyData.key; - if (_RDEBUG) trace(_OUT, "makeKey()"); + //if (_RDEBUG) trace(_OUT, "makeKey()"); return sessionKey; } @@ -647,7 +659,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor blockEncrypt(in, result, inOffset, outOffset, sessionKey); return; } - if (_RDEBUG) trace(_IN, "blockEncrypt(" + in + ", " + inOffset + ", " + sessionKey + ", " + blockSize + ")"); + //if (_RDEBUG) trace(_IN, "blockEncrypt(" + in + ", " + inOffset + ", " + sessionKey + ", " + blockSize + ")"); Object[] sKey = (Object[]) sessionKey; // extract encryption round keys int[][] Ke = (int[][]) sKey[0]; @@ -673,7 +685,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor ^ _T3[(t[(i + s2) % BC] >>> 8) & 0xFF] ^ _T4[t[(i + s3) % BC] & 0xFF]) ^ Ke[r][i]; System.arraycopy(a, 0, t, 0, BC); - if (_RDEBUG && _debuglevel > 6) System.out.println("CT" + r + "=" + toString(t)); + //if (_RDEBUG && _debuglevel > 6) System.out.println("CT" + r + "=" + toString(t)); } for (i = 0; i < BC; i++) { // last round is special tt = Ke[ROUNDS][i]; @@ -682,11 +694,13 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor result[j++] = (byte) (_S[(t[(i + s2) % BC] >>> 8) & 0xFF] ^ (tt >>> 8)); result[j++] = (byte) (_S[t[(i + s3) % BC] & 0xFF] ^ tt); } +/**** if (_RDEBUG && _debuglevel > 6) { System.out.println("CT=" + toString(result)); System.out.println(); } if (_RDEBUG) trace(_OUT, "blockEncrypt()"); +****/ } /** @@ -704,7 +718,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor return; } - if (_RDEBUG) trace(_IN, "blockDecrypt(" + in + ", " + inOffset + ", " + sessionKey + ", " + blockSize + ")"); + //if (_RDEBUG) trace(_IN, "blockDecrypt(" + in + ", " + inOffset + ", " + sessionKey + ", " + blockSize + ")"); Object[] sKey = (Object[]) sessionKey; // extract decryption round keys int[][] Kd = (int[][]) sKey[1]; @@ -730,7 +744,7 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor ^ _T7[(t[(i + s2) % BC] >>> 8) & 0xFF] ^ _T8[t[(i + s3) % BC] & 0xFF]) ^ Kd[r][i]; System.arraycopy(a, 0, t, 0, BC); - if (_RDEBUG && _debuglevel > 6) System.out.println("PT" + r + "=" + toString(t)); + //if (_RDEBUG && _debuglevel > 6) System.out.println("PT" + r + "=" + toString(t)); } for (i = 0; i < BC; i++) { // last round is special tt = Kd[ROUNDS][i]; @@ -739,11 +753,13 @@ public final class CryptixRijndael_Algorithm // implicit no-argument constructor result[j++] = (byte) (_Si[(t[(i + s2) % BC] >>> 8) & 0xFF] ^ (tt >>> 8)); result[j++] = (byte) (_Si[t[(i + s3) % BC] & 0xFF] ^ tt); } +/**** if (_RDEBUG && _debuglevel > 6) { System.out.println("PT=" + toString(result)); System.out.println(); } if (_RDEBUG) trace(_OUT, "blockDecrypt()"); +****/ } /** A basic symmetric encryption/decryption test for a given key size. */ diff --git a/history.txt b/history.txt index 54502face..71d1b999e 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +2015-05-06 zzz + * Naming services: Export address books with Windows + line endings on Windows (ticket #1557) + * Transport: Add config to force IPv4 (only) to firewalled (ticket #1541) + 2015-05-04 zzz * i2ptunnel: - Close input stream when HTTP client decompressor diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index ea17ad55f..e1f87e077 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/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 = 15; + public final static long BUILD = 16; /** for example "-test" */ public final static String EXTRA = "";