updated pycrypto

modules/Crypto/Cipher/DES3.py

@@ -44,14 +44,14 @@ as `AES`.
 
 As an example, encryption can be done as follows:
 
-    >>> from Crypto.Cipher import DES3
+    >>> from Crypto.Cipher import DES
     >>> from Crypto import Random
     >>> from Crypto.Util import Counter
     >>>
-    >>> key = b'Sixteen byte key'
-    >>> nonce = Random.new().read(DES3.block_size/2)
-    >>> ctr = Counter.new(DES3.block_size*8/2, prefix=nonce)
-    >>> cipher = DES3.new(key, DES3.MODE_CTR, counter=ctr)
+    >>> key = b'-8B key-'
+    >>> nonce = Random.new().read(DES.block_size/2)
+    >>> ctr = Counter.new(DES.block_size*8/2, prefix=nonce)
+    >>> cipher = DES.new(key, DES.MODE_CTR, counter=ctr)
     >>> plaintext = b'We are no longer the knights who say ni!'
     >>> msg = nonce + cipher.encrypt(plaintext)
 
@@ -71,7 +71,7 @@ class DES3Cipher(blockalgo.BlockAlgo):
 
     def __init__(self, key, *args, **kwargs):
         """Initialize a TDES cipher object
-
+        
         See also `new()` at the module level."""
         blockalgo.BlockAlgo.__init__(self, _DES3, key, *args, **kwargs)
 
@@ -87,8 +87,6 @@ def new(key, *args, **kwargs):
         The chaining mode to use for encryption or decryption.
         Default is `MODE_ECB`.
       IV : byte string
-        (*Only* `MODE_CBC`, `MODE_CFB`, `MODE_OFB`, `MODE_OPENPGP`).
-
         The initialization vector to use for encryption or decryption.
         
         It is ignored for `MODE_ECB` and `MODE_CTR`.
@@ -97,20 +95,13 @@ def new(key, *args, **kwargs):
         and `block_size` +2 bytes for decryption (in the latter case, it is
         actually the *encrypted* IV which was prefixed to the ciphertext).
         It is mandatory.
-
-        For all other modes, it must be 8 bytes long.
-      nonce : byte string
-        (*Only* `MODE_EAX`).
-        A mandatory value that must never be reused for any other encryption.
-        There are no restrictions on its length, but it is recommended to
-        use at least 16 bytes.
+       
+        For all other modes, it must be `block_size` bytes longs. It is optional and
+        when not present it will be given a default value of all zeroes.
       counter : callable
         (*Only* `MODE_CTR`). A stateful function that returns the next
-        *counter block*, which is a byte string of 8 bytes.
+        *counter block*, which is a byte string of `block_size` bytes.
         For better performance, use `Crypto.Util.Counter`.
-      mac_len : integer
-        (*Only* `MODE_EAX`). Length of the MAC, in bytes.
-        It must be no larger than 8 (which is the default).
       segment_size : integer
         (*Only* `MODE_CFB`).The number of bits the plaintext and ciphertext
         are segmented in.
@@ -136,8 +127,6 @@ MODE_OFB = 5
 MODE_CTR = 6
 #: OpenPGP Mode. See `blockalgo.MODE_OPENPGP`.
 MODE_OPENPGP = 7
-#: EAX Mode. See `blockalgo.MODE_EAX`.
-MODE_EAX = 9
 #: Size of a data block (in bytes)
 block_size = 8
 #: Size of a key (in bytes)