X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ctypescrypto%2Fpkey.py;h=9257dfbcce2a4ccd3546dfa493f4e1eb873ed86f;hb=5eb6b4548beeacbd191b9c49a9b6cb7acf339837;hp=59a53486f9f62e877cf1748fc5e6c83f5f15a063;hpb=0032b97ea6d4348c0f11ee160c824ebe2e181696;p=oss%2Fctypescrypto.git

diff --git a/ctypescrypto/pkey.py b/ctypescrypto/pkey.py
index 59a5348..9257dfb 100644
--- a/ctypescrypto/pkey.py
+++ b/ctypescrypto/pkey.py
@@ -30,16 +30,16 @@ def password_callback(buf,length,rwflag,u):
 
 _cb=CALLBACK_FUNC(password_callback)
 
-class PKey:
+class PKey(object):
 	def __init__(self,ptr=None,privkey=None,pubkey=None,format="PEM",cansign=False,password=None):
 		if not ptr is None:
 			self.key=ptr
 			self.cansign=cansign
 			if not privkey is None or not pubkey is None:
-				raise TypeError("Just one of pubkey or privkey can be specified")
+				raise TypeError("Just one of ptr, pubkey or privkey can be specified")
 		elif not privkey is None:
 			if not pubkey is None:
-				raise TypeError("Just one of pubkey or privkey can be specified")
+				raise TypeError("Just one of ptr, pubkey or privkey can be specified")
 			b=Membio(privkey)
 			self.cansign=True
 			if format == "PEM":
@@ -152,7 +152,7 @@ class PKey:
 			rsa_keygen_bits=number - size of key to be generated
 			rsa_keygen_pubexp - RSA public expontent(default 65537)
 
-			Algorithn specific parameters for DSA,DH and EC
+			Algorithm specific parameters for DSA,DH and EC
 
 			paramsfrom=PKey object
 
@@ -241,9 +241,9 @@ class PKey:
 				continue
 			rv=libcrypto.EVP_PKEY_CTX_ctrl_str(ctx,oper,str(opts[oper]))
 			if rv==-2:
-				raise PKeyError("Parameter %s is not supported by key"%(oper))
+				raise PKeyError("Parameter %s is not supported by key"%(oper,))
 			if rv<1:
-				raise PKeyError("Error setting parameter %s"(oper))
+				raise PKeyError("Error setting parameter %s"%(oper,))
 # Declare function prototypes
 libcrypto.EVP_PKEY_cmp.argtypes=(c_void_p,c_void_p)
 libcrypto.PEM_read_bio_PrivateKey.restype=c_void_p