X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tests%2Ftestcipher.py;h=7fa5a97b6473e866b4e50f3f8b9a021ed15e98ac;hb=286eefceb9abdd5f09ba85eaf15c7dd47a45856c;hp=3cc848c0a963600841d271c59d0cd6916d924f3a;hpb=b4ee51a0aca14c0af5853545b9e524cc1b57b656;p=oss%2Fctypescrypto.git

diff --git a/tests/testcipher.py b/tests/testcipher.py
index 3cc848c..7fa5a97 100644
--- a/tests/testcipher.py
+++ b/tests/testcipher.py
@@ -10,6 +10,7 @@ class TestCipherType(unittest.TestCase):
 		self.assertEqual(ct.block_size(),8)
 		self.assertEqual(ct.key_length(),8)
 		self.assertEqual(ct.iv_length(),8)
+		self.assertEqual(ct.algo(),'DES-CBC')
 		self.assertEqual(ct.oid().shortname(),"DES-CBC")
 		self.assertEqual(ct.mode(),"CBC")
 	def test_ciphaesofb(self):
@@ -17,10 +18,18 @@ class TestCipherType(unittest.TestCase):
 		self.assertEqual(ct.block_size(),1)
 		self.assertEqual(ct.key_length(),32)
 		self.assertEqual(ct.iv_length(),16)
+		self.assertEqual(ct.algo(),'AES-256-OFB')
 		self.assertEqual(ct.oid().shortname(),"AES-256-OFB")
 		self.assertEqual(ct.mode(),"OFB")
+	def test_unknowncipher(self):
+		with self.assertRaises(cipher.CipherError):
+			ct=cipher.CipherType("no-such-cipher")
 
 class TestEncryptDecrypt(unittest.TestCase):
+	def test_cons_nokey(self):
+		ct=cipher.CipherType("DES-CBC")
+		with self.assertRaises(ValueError):
+			c=cipher.Cipher(ct,None,None)
 	def test_blockcipher(self):
 		data="sdfdsddf"
 		key='abcdabcd'
@@ -79,16 +88,15 @@ class TestEncryptDecrypt(unittest.TestCase):
 		with self.assertRaises(ValueError):
 			c=cipher.new("AES-128-OFB",key,iv=iv)
 	def test_variable_keylength(self):
-		encryptkey="abcdefabcdef"
+		encryptkey="abcdefabcdefghtlgvasdgdgsdgdsg"
 		data="asdfsdfsdfsdfsdfsdfsdfsdf"
 		iv="abcdefgh"
 		c=cipher.new("bf-ofb",encryptkey,iv=iv)
 		ciphertext=c.update(data)+c.finish()
 		decryptkey=encryptkey[0:5]+encryptkey[5:]
-		with open("cipher.txt","w") as f:
-			f.write(repr(ciphertext)+"\n")
 		d=cipher.new("bf-ofb",decryptkey,encrypt=False,iv=iv)
 		deciph=d.update(ciphertext)+d.finish()
 		self.assertEqual(deciph,data)
+
 if __name__ == '__main__':
 	unittest.main()