Changeset 2deee2b1

Timestamp:

Dec 15, 2010 4:10:03 PM (11 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

4c9558c

Parents:

8e709ee

Message:

AES cleanups and javadoc

Location:

core/java/src/net/i2p/crypto

Files:

• AESEngine.java (modified) (7 diffs)
• CryptixAESEngine.java (modified) (2 diffs)
• CryptixAESKeyCache.java (modified) (4 diffs)
• ElGamalAESEngine.java (modified) (3 diffs)

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

@@ -23 +23 @@
  */
 public class AESEngine {
-    private Log _log;
-    private I2PAppContext _context;
+    protected final Log _log;
+    protected final I2PAppContext _context;
+
     public AESEngine(I2PAppContext ctx) {
         _context = ctx;
-        _log = _context.logManager().getLog(AESEngine.class);
-        if (getClass() == AESEngine.class)
-            _log.warn("Warning: AES is disabled");
+        _log = _context.logManager().getLog(getClass());
+        if (getClass().equals(AESEngine.class))
+            _log.logAlways(Log.WARN, "AES is disabled");
     }
     
@@ -45 +46 @@
     }
     
-    /** Encrypt the payload with the session key
+    /**
+     * Encrypt the payload with the session key.
+     * This just copies payload to out, see extension for the real thing.
+     *
      * @param payload data to be encrypted
      * @param payloadIndex index into the payload to start encrypting
@@ -56 +60 @@
     public void encrypt(byte payload[], int payloadIndex, byte out[], int outIndex, SessionKey sessionKey, byte iv[], int ivOffset, int length) {
         System.arraycopy(payload, payloadIndex, out, outIndex, length);
-        _log.warn("Warning: AES is disabled");
+        _log.logAlways(Log.WARN, "AES is disabled");
     }
 
@@ -119 +123 @@
     }
 
-
     /** Decrypt the data with the session key
      * @param payload data to be decrypted
@@ -133 +136 @@
     }
     
-    /** Decrypt the data with the session key
+    /**
+     * Decrypt the data with the session key.
+     * This just copies payload to out, see extension for the real thing.
+     *
      * @param payload data to be decrypted
      * @param payloadIndex index into the payload to start decrypting
@@ -144 +150 @@
     public void decrypt(byte payload[], int payloadIndex, byte out[], int outIndex, SessionKey sessionKey, byte iv[], int ivOffset, int length) {
         System.arraycopy(payload, payloadIndex, out, outIndex, length);
-        _log.warn("Warning: AES is disabled");
+        _log.logAlways(Log.WARN, "AES is disabled");
     }
 
     /**
-     *   Just copies payload to out
+     * This just copies payload to out, see extension for the real thing.
      *   @param sessionKey unused
      */
@@ -155 +161 @@
     }
 
-    /** decrypt the data with the session key provided
+    /**
+     * This just copies payload to rv, see extension for the real thing.
+     *
      * @param payload encrypted data
      * @param sessionKey private session key

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

@@ -28 +28 @@
  */
 public class CryptixAESEngine extends AESEngine {
-    private Log _log;
     private final static CryptixRijndael_Algorithm _algo = new CryptixRijndael_Algorithm();
     private final static boolean USE_FAKE_CRYPTO = false;
-    private final static byte FAKE_KEY = 0x2A;
-    private CryptixAESKeyCache _cache;
+    // keys are now cached in the SessionKey objects
+    //private CryptixAESKeyCache _cache;
     
     private static final ByteCache _prevCache = ByteCache.getInstance(16, 16);
@@ -38 +37 @@
     public CryptixAESEngine(I2PAppContext context) {
         super(context);
-        _log = context.logManager().getLog(CryptixAESEngine.class);
-        _cache = new CryptixAESKeyCache();
+        //_cache = new CryptixAESKeyCache();
     }
     

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

@@ -9 +9 @@
  * of code)
  *
+ * Unused as a class, as the keys are cached in the SessionKey objects,
+ * but the static methods are used in FortunaStandalone.
  */
 public final class CryptixAESKeyCache {
@@ -21 +23 @@
     private static final int MAX_KEYS = 64;
     
+    /*
+     * @deprecated unused, keys are now cached in the SessionKey objects
+     */
     public CryptixAESKeyCache() {
         _availableKeys = new LinkedBlockingQueue(MAX_KEYS);
@@ -28 +33 @@
      * Get the next available structure, either from the cache or a brand new one
      *
+     * @deprecated unused, keys are now cached in the SessionKey objects
      */
     public final KeyCacheEntry acquireKey() {
@@ -39 +45 @@
      * Put this structure back onto the available cache for reuse
      *
+     * @deprecated unused, keys are now cached in the SessionKey objects
      */
     public final void releaseKey(KeyCacheEntry key) {

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

@@ -30 +30 @@
  * Handles the actual ElGamal+AES encryption and decryption scenarios using the
  * supplied keys and data.
+ *
+ * No, this does not extend AESEngine or CryptixAESEngine.
  */
 public class ElGamalAESEngine {
-    private final static Log _log = new Log(ElGamalAESEngine.class);
+    private final Log _log;
     private final static int MIN_ENCRYPTED_SIZE = 80; // smallest possible resulting size
-    private I2PAppContext _context;
-
-    private ElGamalAESEngine() { // nop
-    }
+    private final I2PAppContext _context;
 
     public ElGamalAESEngine(I2PAppContext ctx) {
         _context = ctx;
+        _log = _context.logManager().getLog(ElGamalAESEngine.class);
         
         _context.statManager().createFrequencyStat("crypto.elGamalAES.encryptNewSession",
@@ -628 +628 @@
     }
 
+/****
     public static void main(String args[]) {
         I2PAppContext ctx = new I2PAppContext();
@@ -657 +658 @@
         }
     }
+****/
 }