X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ctypescrypto%2Fcipher.py;h=332272570f824c9830dbe003a09c123f138b5aa7;hb=0032b97ea6d4348c0f11ee160c824ebe2e181696;hp=90fd20336aeb80ddb5896009eabdec988bb479d2;hpb=6ecf699650b17d6c8d8a8670d51b33631824fe46;p=oss%2Fctypescrypto.git

diff --git a/ctypescrypto/cipher.py b/ctypescrypto/cipher.py
index 90fd203..3322725 100644
--- a/ctypescrypto/cipher.py
+++ b/ctypescrypto/cipher.py
@@ -44,7 +44,7 @@ class CipherType:
 		"""
 		self.cipher = libcrypto.EVP_get_cipherbyname(cipher_name)
 		if self.cipher is None:
-			raise CipherError, "Unknown cipher: %s" % cipher_name
+			raise CipherError("Unknown cipher: %s" % cipher_name)
 
 	def __del__(self):
 		pass
@@ -115,7 +115,7 @@ class Cipher:
 		iv_ptr = c_char_p(iv)
 		self.ctx = libcrypto.EVP_CIPHER_CTX_new()
 		if self.ctx == 0:
-			raise CipherError, "Unable to create cipher context"
+			raise CipherError("Unable to create cipher context")
 		self.encrypt = encrypt
 		if encrypt: 
 			enc = 1
@@ -139,7 +139,7 @@ class Cipher:
 			result = libcrypto.EVP_CipherInit_ex(self.ctx, cipher_type.cipher, None, key_ptr, iv_ptr, c_int(enc))
 		if result == 0:
 			self._clean_ctx()
-			raise CipherError, "Unable to initialize cipher"
+			raise CipherError("Unable to initialize cipher")
 		self.cipher_type = cipher_type
 		self.block_size = self.cipher_type.block_size()
 		self.cipher_finalized = False
@@ -170,9 +170,9 @@ class Cipher:
 			called
 		"""
 		if self.cipher_finalized :
-			raise CipherError, "No updates allowed"
+			raise CipherError("No updates allowed")
 		if type(data) != type(""):
-			raise TypeError, "A string is expected"
+			raise TypeError("A string is expected")
 		if len(data) <= 0:
 			return ""
 		outbuf=create_string_buffer(self.block_size+len(data))
@@ -192,14 +192,14 @@ class Cipher:
 			state, they would be processed and returned.
 		"""
 		if self.cipher_finalized :
-			raise CipherError, "Cipher operation is already completed"
+			raise CipherError("Cipher operation is already completed")
 		outbuf=create_string_buffer(self.block_size)
 		self.cipher_finalized = True
 		outlen=c_int(0)
 		result = libcrypto.EVP_CipherFinal_ex(self.ctx,outbuf , byref(outlen))
 		if result == 0:
 			self._clean_ctx()
-			raise CipherError, "Unable to finalize cipher"
+			raise CipherError("Unable to finalize cipher")
 		if outlen.value>0:
 			return outbuf.raw[:outlen.value]
 		else: