diff options
author | Legrandin <gooksankoo@hoiptorrow.mailexpire.com> | 2012-05-14 19:01:51 +0200 |
---|---|---|
committer | Legrandin <gooksankoo@hoiptorrow.mailexpire.com> | 2012-05-14 19:03:39 +0200 |
commit | d0863eabfb3940375339968752aeb1fea6e13ccf (patch) | |
tree | c94add19709c2ba2df3d04b3df9dc9a3f6e0f1a2 | |
parent | b0cf21ed203793542cc094d49256f2fe3a8efe87 (diff) | |
download | pycrypto-d0863eabfb3940375339968752aeb1fea6e13ccf.tar.gz |
Minor fixes for documentation of ciphers
Fixed key lengths described with xrange()
Removed unnecessary imports.
Removed documentation for compiled modules starting with '_'.
-rw-r--r-- | lib/Crypto/Cipher/AES.py | 1 | ||||
-rw-r--r-- | lib/Crypto/Cipher/ARC2.py | 3 | ||||
-rw-r--r-- | lib/Crypto/Cipher/Blowfish.py | 3 | ||||
-rw-r--r-- | lib/Crypto/Cipher/CAST.py | 3 | ||||
-rw-r--r-- | lib/Crypto/Cipher/DES.py | 1 | ||||
-rw-r--r-- | lib/Crypto/Cipher/DES3.py | 1 | ||||
-rw-r--r-- | lib/Crypto/Cipher/__init__.py | 3 |
7 files changed, 5 insertions, 10 deletions
diff --git a/lib/Crypto/Cipher/AES.py b/lib/Crypto/Cipher/AES.py index 6b31686..1538df2 100644 --- a/lib/Crypto/Cipher/AES.py +++ b/lib/Crypto/Cipher/AES.py @@ -37,7 +37,6 @@ encryption. __revision__ = "$Id$" from Crypto.Cipher import blockalgo -from blockalgo import * from Crypto.Cipher import _AES class AESCipher (blockalgo.BlockAlgo): diff --git a/lib/Crypto/Cipher/ARC2.py b/lib/Crypto/Cipher/ARC2.py index 0143e8c..7393497 100644 --- a/lib/Crypto/Cipher/ARC2.py +++ b/lib/Crypto/Cipher/ARC2.py @@ -49,7 +49,6 @@ New designs should not use RC2. __revision__ = "$Id$" from Crypto.Cipher import blockalgo -from blockalgo import * from Crypto.Cipher import _ARC2 class RC2Cipher (blockalgo.BlockAlgo): @@ -107,5 +106,5 @@ MODE_CTR = 6 #: Size of a data block (in bytes) block_size = 8 #: Size of a key (in bytes) -key_size = xrange(1,16) +key_size = xrange(1,16+1) diff --git a/lib/Crypto/Cipher/Blowfish.py b/lib/Crypto/Cipher/Blowfish.py index 912daa1..783a5a1 100644 --- a/lib/Crypto/Cipher/Blowfish.py +++ b/lib/Crypto/Cipher/Blowfish.py @@ -37,7 +37,6 @@ to be big enough to withstand a brute force attack (e.g. at least 16 bytes). __revision__ = "$Id$" from Crypto.Cipher import blockalgo -from blockalgo import * from Crypto.Cipher import _Blowfish class BlowfishCipher (blockalgo.BlockAlgo): @@ -92,5 +91,5 @@ MODE_CTR = 6 #: Size of a data block (in bytes) block_size = 8 #: Size of a key (in bytes) -key_size = xrange(4,56) +key_size = xrange(4,56+1) diff --git a/lib/Crypto/Cipher/CAST.py b/lib/Crypto/Cipher/CAST.py index 50f00c3..8a57548 100644 --- a/lib/Crypto/Cipher/CAST.py +++ b/lib/Crypto/Cipher/CAST.py @@ -39,7 +39,6 @@ Keys of sufficient length should be used to prevent brute force attacks __revision__ = "$Id$" from Crypto.Cipher import blockalgo -from blockalgo import * from Crypto.Cipher import _CAST class CAST128Cipher(blockalgo.BlockAlgo): @@ -94,4 +93,4 @@ MODE_CTR = 6 #: Size of a data block (in bytes) block_size = 8 #: Size of a key (in bytes) -key_size = xrange(5,16) +key_size = xrange(5,16+1) diff --git a/lib/Crypto/Cipher/DES.py b/lib/Crypto/Cipher/DES.py index 3b981d3..a6fae5c 100644 --- a/lib/Crypto/Cipher/DES.py +++ b/lib/Crypto/Cipher/DES.py @@ -41,7 +41,6 @@ DES should not be used for new designs. Use `AES`. __revision__ = "$Id$" from Crypto.Cipher import blockalgo -from blockalgo import * from Crypto.Cipher import _DES class DESCipher(blockalgo.BlockAlgo): diff --git a/lib/Crypto/Cipher/DES3.py b/lib/Crypto/Cipher/DES3.py index 5015152..84492cf 100644 --- a/lib/Crypto/Cipher/DES3.py +++ b/lib/Crypto/Cipher/DES3.py @@ -51,7 +51,6 @@ as `AES`. __revision__ = "$Id$" from Crypto.Cipher import blockalgo -from blockalgo import * from Crypto.Cipher import _DES3 class DES3Cipher(blockalgo.BlockAlgo): diff --git a/lib/Crypto/Cipher/__init__.py b/lib/Crypto/Cipher/__init__.py index 70b35c2..0bb1ba5 100644 --- a/lib/Crypto/Cipher/__init__.py +++ b/lib/Crypto/Cipher/__init__.py @@ -68,7 +68,8 @@ Crypto.Cipher.PKCS1_v1.5 PKCS#1 v1.5 encryption, based on RSA key pairs Crypto.Cipher.PKCS1_OAEP PKCS#1 OAEP encryption, based on RSA key pairs ======================== ======================= -:undocumented: __revision__, __package__ +:undocumented: __revision__, __package__, _AES, _ARC2, _ARC4, _Blowfish + _CAST, _DES, _DES3 """ __all__ = ['AES', 'ARC2', 'ARC4', |