* Removed CTRCipher as pycryptopp doesn't need it.

* Changed AES to use 256 bit. --HG-- branch : trunk
bbangert · Feb 13, 2008 · 316e3ed · 316e3ed
1 parent d6085cf
commit 316e3ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 82 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,8 @@ Beaker Changelog
 ================
 
 0.9.2 (**tip**)
+* Removed CTRCipher as pycryptopp doesn't need it.
+* Changed AES to use 256 bit.
 * Fixed signing code to use hmac with sha for better signing security.
 * Fixed memcached code to use delete_multi on clearing the keys for efficiency
   and updated key retrieval to properly store and retrieve None values.

diff --git a/beaker/crypto/CTRCipher.py b/beaker/crypto/CTRCipher.py
diff --git a/beaker/crypto/__init__.py b/beaker/crypto/__init__.py
@@ -8,5 +8,5 @@ def generateCryptoKeys(master_key, salt, iterations):
     # os.urandom() returns truly random data, this will have no effect on the
     # overall security.
     keystream = PBKDF2(master_key, salt, iterations=iterations)
-    cipher_key = keystream.read(16)     # 128-bit AES key (for the payload)
+    cipher_key = keystream.read(32)     # 256-bit AES key (for the payload)
     return cipher_key