diff options
author | Legrandin <helderijs@gmail.com> | 2013-08-04 22:46:06 +0200 |
---|---|---|
committer | Dwayne Litzenberger <dlitz@dlitz.net> | 2013-10-20 13:30:21 -0700 |
commit | 8766da37a2612ebcea13c7451a2157d175f29a41 (patch) | |
tree | 1b7571a13e04473efde5975916527134832d84e7 /lib/Crypto/SelfTest | |
parent | d044a478332682c253c379db87d444b056e4ab37 (diff) | |
download | pycrypto-8766da37a2612ebcea13c7451a2157d175f29a41.tar.gz |
whitespace changes (pre-AEAD)
[dlitz@dlitz.net: Whitespace changes extracted from the author's pull request:]
- [9c13f9c] Rename 'IV' parameter to 'nonce' for AEAD modes.
- [4ec64d8] Removed last references to ApiUsageError
- [ee46922] Removed most 'import *' statements
Diffstat (limited to 'lib/Crypto/SelfTest')
-rw-r--r-- | lib/Crypto/SelfTest/Protocol/test_KDF.py | 4 | ||||
-rw-r--r-- | lib/Crypto/SelfTest/PublicKey/test_ElGamal.py | 2 | ||||
-rw-r--r-- | lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py | 2 | ||||
-rw-r--r-- | lib/Crypto/SelfTest/Util/test_asn1.py | 20 |
4 files changed, 14 insertions, 14 deletions
diff --git a/lib/Crypto/SelfTest/Protocol/test_KDF.py b/lib/Crypto/SelfTest/Protocol/test_KDF.py index f0a44d1..741c4ce 100644 --- a/lib/Crypto/SelfTest/Protocol/test_KDF.py +++ b/lib/Crypto/SelfTest/Protocol/test_KDF.py @@ -45,7 +45,7 @@ class PBKDF1_Tests(unittest.TestCase): # From http://www.di-mgt.com.au/cryptoKDFs.html#examplespbkdf ("password","78578E5A5D63CB06",16,1000,"DC19847E05C64D2FAF10EBFB4A3D2A20"), ) - + def test1(self): v = self._testData[0] res = PBKDF1(v[0], t2b(v[1]), v[2], v[3], SHA1) @@ -71,7 +71,7 @@ class PBKDF2_Tests(unittest.TestCase): 25, 4096, "3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038"), ( 'pass\x00word',"7361006c74",16,4096, "56fa6aa75548099dcc37d7f03425e0c3"), ) - + def test1(self): # Test only for HMAC-SHA1 as PRF diff --git a/lib/Crypto/SelfTest/PublicKey/test_ElGamal.py b/lib/Crypto/SelfTest/PublicKey/test_ElGamal.py index cdee8cf..0c76792 100644 --- a/lib/Crypto/SelfTest/PublicKey/test_ElGamal.py +++ b/lib/Crypto/SelfTest/PublicKey/test_ElGamal.py @@ -151,7 +151,7 @@ class ElGamalTest(unittest.TestCase): tv2['key'] += [tv2[c]] del tv2[c] return tv2 - + def _test_random_key(self, bits): elgObj = ElGamal.generate(bits, Random.new().read) self._check_private_key(elgObj) diff --git a/lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py b/lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py index 314d2b8..d8ddda3 100644 --- a/lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py +++ b/lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py @@ -385,7 +385,7 @@ class PKCS1_PSS_Tests(unittest.TestCase): rng = Random.new().read key = MyKey(RSA.generate(1024,rng)) - + # Helper function to monitor what's request from MGF global mgfcalls def newMGF(seed,maskLen): diff --git a/lib/Crypto/SelfTest/Util/test_asn1.py b/lib/Crypto/SelfTest/Util/test_asn1.py index 58d12b4..0986c70 100644 --- a/lib/Crypto/SelfTest/Util/test_asn1.py +++ b/lib/Crypto/SelfTest/Util/test_asn1.py @@ -63,12 +63,12 @@ class DerObjectTests(unittest.TestCase): # Initialize with payload der = DerObject(0x03, b('\x12\x12')) self.assertEquals(der.encode(), b('\x03\x02\x12\x12')) - + def testObjEncode3(self): # Long payload der = DerObject(b('\x10')) der.payload = b("0")*128 - self.assertEquals(der.encode(), b('\x10\x81\x80' + "0"*128)) + self.assertEquals(der.encode(), b('\x10\x81\x80' + "0"*128)) def testObjEncode4(self): # Implicit tags (constructed) @@ -79,7 +79,7 @@ class DerObjectTests(unittest.TestCase): der = DerObject(0x02, implicit=0x1E, constructed=False) der.payload = b('ppll') self.assertEquals(der.encode(), b('\x9E\x04ppll')) - + # ----- def testObjDecode1(self): @@ -185,7 +185,7 @@ class DerIntegerTests(unittest.TestCase): # Value -128 der = DerInteger(-128) self.assertEquals(der.encode(), b('\x02\x01\x80')) - # Value + # Value der = DerInteger(-87873) self.assertEquals(der.encode(), b('\x02\x03\xFE\xA8\xBF')) @@ -260,7 +260,7 @@ class DerIntegerTests(unittest.TestCase): # Wide length field der = DerInteger() self.assertRaises(ValueError, der.decode, b('\x02\x81\x01\x01')) - + class DerSequenceTests(unittest.TestCase): def testInit1(self): @@ -296,13 +296,13 @@ class DerSequenceTests(unittest.TestCase): self.assertEquals(len(der),1) self.assertEquals(der[0],1) self.assertEquals(der.encode(), b('0\x03\x02\x01\x01')) - + def testEncode3(self): # One multi-byte integer (non-zero) der = DerSequence() der.append(0x180L) self.assertEquals(der.encode(), b('0\x04\x02\x02\x01\x80')) - + def testEncode4(self): # One very long integer der = DerSequence() @@ -389,7 +389,7 @@ class DerSequenceTests(unittest.TestCase): der.decode(b('0\x03\x02\x01\x7f')) self.assertEquals(len(der),1) self.assertEquals(der[0],127) - + def testDecode4(self): # One very long integer der = DerSequence() @@ -495,7 +495,7 @@ class DerOctetStringTests(unittest.TestCase): # No leftovers allowed der = DerOctetString() self.assertRaises(ValueError, der.decode, b('\x04\x01\x01\xff')) - + class DerNullTests(unittest.TestCase): def testEncode1(self): @@ -632,7 +632,7 @@ class DerSetOfTests(unittest.TestCase): der = DerSetOf() self.assertRaises(ValueError, der.decode, b('1\x08\x02\x02\x01\x80\x02\x02\x00\xff\xAA')) - + def get_tests(config={}): from Crypto.SelfTest.st_common import list_test_cases listTests = [] |