Merge branch 'hash_module' of git+ssh://tiftof@repo.or.cz/srv/git/python-cryptoplus into hash_module

Author: Christophe Oosterlynck

src/CryptoPlus/Cipher/AES.py

@@ -11,6 +11,10 @@ def new(key,mode=MODE_ECB,IV=None,counter=None,segment_size=None):
             -> only needed for CBC mode
         counter = counter object (CryptoPlus.Util.util.Counter)
             -> only needed for CTR mode
+        segment_size = amount of bits to use from the keystream in each chain part
+            -> supported values: multiple of 8 between 8 and the blocksize
+               of the cipher (only per byte access possible), default is 8
+            -> only needed for CFB mode
 
     EXAMPLES:
     **********

src/CryptoPlus/Cipher/ARC2.py

@@ -3,7 +3,7 @@
 import Crypto
 from pkg_resources import parse_version
 
-def new(key,mode=MODE_ECB,IV=None,counter=None,effective_keylen=None,segment_size=None):
+def new(key,mode=MODE_ECB,IV=None,counter=None,segment_size=None,effective_keylen=None):
     """Create a new cipher object
 
     ARC2 using pycrypto for algo and pycryptoplus for ciphermode
@@ -14,6 +14,10 @@ def new(key,mode=MODE_ECB,IV=None,counter=None,effective_keylen=None,segment_siz
             -> only needed for CBC mode
         counter = counter object (CryptoPlus.Util.util.Counter)
             -> only needed for CTR mode
+        segment_size = amount of bits to use from the keystream in each chain part
+            -> supported values: multiple of 8 between 8 and the blocksize
+               of the cipher (only per byte access possible), default is 8
+            -> only needed for CFB mode
         effective_keylen = how much bits to effectively use from the supplied key
             -> will only be used when the pycrypto version on your system is >2.0.1
 

src/CryptoPlus/Cipher/Blowfish.py

@@ -12,6 +12,10 @@ def new(key,mode=MODE_ECB,IV=None,counter=None,segment_size=None):
             -> only needed for CBC mode
         counter = counter object (CryptoPlus.Util.util.Counter)
             -> only needed for CTR mode
+        segment_size = amount of bits to use from the keystream in each chain part
+            -> supported values: multiple of 8 between 8 and the blocksize
+               of the cipher (only per byte access possible), default is 8
+            -> only needed for CFB mode
 
     EXAMPLES:
     **********

src/CryptoPlus/Cipher/CAST.py

@@ -12,6 +12,10 @@ def new(key,mode=MODE_ECB,IV=None,counter=None,segment_size=None):
             -> only needed for CBC mode
         counter = counter object (CryptoPlus.Util.util.Counter)
             -> only needed for CTR mode
+        segment_size = amount of bits to use from the keystream in each chain part
+            -> supported values: multiple of 8 between 8 and the blocksize
+               of the cipher (only per byte access possible), default is 8
+            -> only needed for CFB mode
 
     EXAMPLES:
     **********

src/CryptoPlus/Cipher/DES.py

@@ -12,6 +12,10 @@ def new(key,mode=MODE_ECB,IV=None,counter=None,segment_size=None):
             -> only needed for CBC mode
         counter = counter object (CryptoPlus.Util.util.Counter)
             -> only needed for CTR mode
+        segment_size = amount of bits to use from the keystream in each chain part
+            -> supported values: multiple of 8 between 8 and the blocksize
+               of the cipher (only per byte access possible), default is 8
+            -> only needed for CFB mode
 
     EXAMPLES:
     **********

src/CryptoPlus/Cipher/DES3.py

@@ -14,6 +14,10 @@ def new(key,mode=MODE_ECB,IV=None,counter=None,segment_size=None):
             -> only needed for CBC mode
         counter = counter object (CryptoPlus.Util.util.Counter)
             -> only needed for CTR mode
+        segment_size = amount of bits to use from the keystream in each chain part
+            -> supported values: multiple of 8 between 8 and the blocksize
+               of the cipher (only per byte access possible), default is 8
+            -> only needed for CFB mode
 
     EXAMPLES:
     **********

src/CryptoPlus/Cipher/IDEA.py

@@ -16,6 +16,10 @@ def new(key,mode=MODE_ECB,IV=None,counter=None,segment_size=None):
             -> only needed for CBC mode
         counter = counter object (CryptoPlus.Util.util.Counter)
             -> only needed for CTR mode
+        segment_size = amount of bits to use from the keystream in each chain part
+            -> supported values: multiple of 8 between 8 and the blocksize
+               of the cipher (only per byte access possible), default is 8
+            -> only needed for CFB mode
 
     EXAMPLES:
     **********

src/CryptoPlus/Cipher/RC5.py

@@ -5,7 +5,7 @@
     print "Crypto.Cipher.RC5 isn't available. You're probably using the Debian pycrypto version. Install the original pycrypto for RC5."
     raise
 
-def new(key,mode=MODE_ECB,IV=None,counter=None,rounds=12,word_size=32,segment_size=None):
+def new(key,mode=MODE_ECB,IV=None,counter=None,segment_size=None,rounds=12,word_size=32):
     """Create a new cipher object
 
     RC5 using pycrypto for algo and pycryptoplus for ciphermode
@@ -17,6 +17,10 @@ def new(key,mode=MODE_ECB,IV=None,counter=None,rounds=12,word_size=32,segment_si
             -> only needed for CBC mode
         counter = counter object (CryptoPlus.Util.util.Counter)
             -> only needed for CTR mode
+        segment_size = amount of bits to use from the keystream in each chain part
+            -> supported values: multiple of 8 between 8 and the blocksize
+               of the cipher (only per byte access possible), default is 8
+            -> only needed for CFB mode
         rounds = amount of rounds, default = 12
                  minimum 12 and multiple of 2
         word_size = RC5 word size (bits), supported = 16 and 32, default = 32

src/CryptoPlus/Cipher/blockcipher.py

@@ -204,12 +204,12 @@ def final(self,padfct=padding.PKCS7):
         For OFB,CFB, CTR: an encrypted padding will be returned, making the
                           total outputed bytes since construction of the cipher
                           a multiple of the blocksize of that cipher.
-        
+
         If the cipher has been used for decryption, the final function won't do
-        antyhing. You have to manually unpad if necessary.
+          anything. You have to manually unpad if necessary.
 
         After finalization, the chain can still be used but the IV, counter etc
-        aren't reset but just continu as they were after the last step (finalization step).
+          aren't reset but just continue as they were after the last step (finalization step).
         """
         assert self.mode not in (MODE_XTS, MODE_CMAC) # finalizing (=padding) doesn't make sense when in XTS or CMAC mode
         if self.ed == 'e':
@@ -433,7 +433,7 @@ def update(self, data, ed):
 class XTS:
     """XTS Chaining Mode
     
-    Usable with blockcihpers with a 16 byte blocksize
+    Usable with blockciphers with a 16-byte blocksize
     """
     # TODO: allow other blocksizes besides 16bytes?
     def __init__(self,codebook1, codebook2):
@@ -516,7 +516,7 @@ class CMAC:
       in the list CMAC.supported_blocksizes.
     The hashlength is equal to block size of the used block cipher.
     
-    Usable with blockcihpers with a 8 or 16 byte blocksize
+    Usable with blockciphers with a 8 or 16-byte blocksize
     """
     # TODO: move to hash module?
     # TODO: change update behaviour to .update() and .digest() as for all hash modules?

src/CryptoPlus/Cipher/python_AES.py

@@ -16,6 +16,10 @@ def new(key,mode=MODE_ECB,IV=None,counter=None,segment_size=None):
             -> only needed for CTR mode
             -> use a seperate counter object for the cipher and decipher: the counter is updated directly, not a copy
                 see CTR example further on in the docstring
+        segment_size = amount of bits to use from the keystream in each chain part
+            -> supported values: multiple of 8 between 8 and the blocksize
+               of the cipher (only per byte access possible), default is 8
+            -> only needed for CFB mode
 
     Notes:
         - Always construct a seperate cipher object for encryption and decryption. Once a cipher object has been used for encryption,