X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ctypescrypto%2Fpkey.py;h=a561ddf23df08bbb7daea0e777ffe00c690b9595;hb=746b0fc7d681dc9b27ea5f3ee27da20abb638eaa;hp=0ef789d0bd064ffdbd4e2135c59cc15d7ce13ee1;hpb=27e6cd7b4e503aa15ad7a2dc53633f343d018dda;p=oss%2Fctypescrypto.git

diff --git a/ctypescrypto/pkey.py b/ctypescrypto/pkey.py
index 0ef789d..a561ddf 100644
--- a/ctypescrypto/pkey.py
+++ b/ctypescrypto/pkey.py
@@ -2,7 +2,7 @@ from ctypes import c_char_p,c_void_p,byref,c_int,c_long, c_longlong, create_stri
 from ctypescrypto import libcrypto
 from ctypescrypto.exception import LibCryptoError,clear_err_stack
 from ctypescrypto.bio import Membio
-
+import sys
 class PKeyError(LibCryptoError):
 	pass
 
@@ -31,7 +31,7 @@ class PKey:
 			if format == "PEM":
 				self.key=libcrypto.PEM_read_bio_PrivateKey(b.bio,None,_cb,c_char_p(password))
 			else: 
-				self.key=libcrypto.d2i_PKCS8PrivateKey_bio(b.bio,None,_cb,c_char_p(password))
+				self.key=libcrypto.d2i_PrivateKey_bio(b.bio,None)
 			if self.key is None:
 				raise PKeyError("error parsing private key")
 		elif not pubkey is None:
@@ -73,47 +73,83 @@ class PKey:
 			raise PKeyError("Initailizing sign context")
 		if libcrypto.EVP_PKEY_sign_init(ctx)<1:
 			raise PKeyError("sign_init")
-		for oper in kwargs:
-			rv=libcrypto.EVP_PKEY_CTX_ctrl_str(ctx,oper,kwargs[oper])
-			if rw==-2:
-				raise PKeyError("Parameter %s is not supported by key"%(oper))
-			if rv<1:
-				raise PKeyError("Error setting parameter %s"(oper))
+		self._configure_context(ctx,kwargs)
 		# Find out signature size
 		siglen=c_long(0)
 		if libcrypto.EVP_PKEY_sign(ctx,None,byref(siglen),digest,len(digest))<1:
 			raise PKeyError("signing")	
 		sig=create_string_buffer(siglen.value)
-		libcrypto.EVP_PKEY_sign(ctx,sig,byref(signlen),digest,len(digest))
+		libcrypto.EVP_PKEY_sign(ctx,sig,byref(siglen),digest,len(digest))
 		libcrypto.EVP_PKEY_CTX_free(ctx)
-		return sig.value[:siglen.value]
+		return sig.raw[:siglen.value]
 
 	def verify(self,digest,signature,**kwargs):
 		"""
 			Verifies given signature on given digest
 			Returns True if Ok, False if don't match
+			Keyword arguments allows to set algorithm-specific
+			parameters
 		"""
 		ctx=libcrypto.EVP_PKEY_CTX_new(self.key,None)
 		if ctx is None:
 			raise PKeyError("Initailizing verify context")
 		if libcrypto.EVP_PKEY_verify_init(ctx)<1:
 			raise PKeyError("verify_init")
-		for oper in kwargs:
-			rv=libcrypto.EVP_PKEY_CTX_ctrl_str(ctx,oper,kwargs[oper])
-			if rw==-2:
-				raise PKeyError("Parameter %s is not supported by key"%(oper))
-			if rv<1:
-				raise PKeyError("Error setting parameter %s"(oper))
+		self._configure_context(ctx,kwargs)
 		rv=libcrypto.EVP_PKEY_verify(ctx,signature,len(signature),digest,len(digest))
 		if rv<0:
 			raise PKeyError("Signature verification")
-		libcrypto=EVP_PKEY_CTX_free(ctx)
+		libcrypto.EVP_PKEY_CTX_free(ctx)
 		return rv>0
+	def derive(self,peerkey,**kwargs):
+		"""
+			Derives shared key (DH,ECDH,VKO 34.10). Requires
+			private key available
+
+			@param peerkey - other key (may be public only)
+
+			Keyword parameters are algorithm-specific
+		"""
+		ctx=libcrypto.EVP_PKEY_CTX_new(self.key,None)
+		if ctx is None:
+			raise PKeyError("Initailizing derive context")
+		if libcrypto.EVP_PKEY_derive_init(ctx)<1:
+			raise PKeyError("derive_init")
+		self._configure_context(self,ctx,kwargs)
+		if libcrypto.EVP_PKEY_derive_set_peer(ctx,peerkey.key)<=0:
+			raise PKeyError("Cannot set peer key")
+		keylen=c_long(0)
+		if libcrypto.EVP_PKEY_derive(ctx,None,byref(keylen))<=0:
+			raise PKeyError("computing shared key length")
+		buf=create_string_buffer(keylen)
+		if libcrypto.EVP_PKEY_derive(ctx,buf,byref(keylen))<=0:
+			raise PKeyError("computing actual shared key")
+		libcrypto.EVP_PKEY_CTX_free(ctx)
+		return buf.raw[:keylen]
+	@staticmethod
 	def generate(algorithm,**kwargs):
 		"""
 			Generates new private-public key pair for given algorithm
 			(string like 'rsa','ec','gost2001') and algorithm-specific
-			parameters
+			parameters.
+
+			Algorithm specific paramteers for RSA:
+
+			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
+
+			paramsfrom=PKey object
+
+			copy parameters of newly generated key from existing key
+
+			Algorithm specific parameters for GOST2001
+
+			paramset= paramset name where name is one of
+			'A','B','C','XA','XB','test'
+
+			paramsfrom does work too
 		"""
 		tmpeng=c_void_p(None)
 		ameth=libcrypto.EVP_PKEY_asn1_find_str(byref(tmpeng),algorithm,-1)
@@ -123,28 +159,82 @@ class PKey:
 		pkey_id=c_int(0)
 		libcrypto.EVP_PKEY_asn1_get0_info(byref(pkey_id),None,None,None,None,ameth)
 		libcrypto.ENGINE_finish(tmpeng)
-		ctx=libcrypto.EVP_PKEY_CTX_new_id(pkey_id)
+		if "paramsfrom" in kwargs:
+			ctx=libcrypto.EVP_PKEY_CTX_new(kwargs["paramsfrom"].key,None)
+		else:
+			ctx=libcrypto.EVP_PKEY_CTX_new_id(pkey_id,None)
+		# FIXME support EC curve as keyword param by invoking paramgen
+		# operation
 		if ctx is None:
 			raise PKeyError("Creating context for key type %d"%(pkey_id.value)) 
 		if libcrypto.EVP_PKEY_keygen_init(ctx) <=0 :
 			raise PKeyError("keygen_init")
-		for oper in kwargs:
-			rv=libcrypto.EVP_PKEY_CTX_ctrl_str(ctx,oper,kwargs[oper])
-			if rw==-2:
-				raise PKeyError("Parameter %s is not supported by key"%(oper))
-			if rv<1:
-				raise PKeyError("Error setting parameter %s"(oper))
+		PKey._configure_context(ctx,kwargs,["paramsfrom"])
 		key=c_void_p(None)
 		if libcrypto.EVP_PKEY_keygen(ctx,byref(key))<=0:
 			raise PKeyError("Error generating key")
 		libcrypto.EVP_PKEY_CTX_free(ctx)
 		return PKey(ptr=key,cansign=True)
-			
+	@staticmethod
+	def _configure_context(ctx,opts,skip=[]):
+		"""
+			Configures context of public key operations
+			@param ctx - context to configure
+			@param opts - dictionary of options (from kwargs of calling
+				function)
+			@param skip - list of options which shouldn't be passed to
+				context
+		"""
+
+		for oper in opts:
+			if oper in skip:
+				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))
+			if rv<1:
+				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
 libcrypto.PEM_read_bio_PrivateKey.argtypes=(c_void_p,POINTER(c_void_p),CALLBACK_FUNC,c_char_p) 
-libcrypto.d2i_PKCS8PrivateKey_bio.restype=c_void_p
-libcrypto.d2i_PKCS8PrivateKey_bio.argtypes=(c_void_p,POINTER(c_void_p),CALLBACK_FUNC,c_char_p)
 libcrypto.PEM_read_bio_PUBKEY.restype=c_void_p
 libcrypto.PEM_read_bio_PUBKEY.argtypes=(c_void_p,POINTER(c_void_p),CALLBACK_FUNC,c_char_p)
+libcrypto.d2i_PUBKEY_bio.restype=c_void_p
+libcrypto.d2i_PUBKEY_bio.argtypes=(c_void_p,c_void_p)
+libcrypto.d2i_PrivateKey_bio.restype=c_void_p
+libcrypto.d2i_PrivateKey_bio.argtypes=(c_void_p,c_void_p)
+libcrypto.EVP_PKEY_print_public.argtypes=(c_void_p,c_void_p,c_int,c_void_p)
+libcrypto.EVP_PKEY_asn1_find_str.restype=c_void_p
+libcrypto.EVP_PKEY_asn1_find_str.argtypes=(c_void_p,c_char_p,c_int)
+libcrypto.EVP_PKEY_asn1_get0_info.restype=c_int
+libcrypto.EVP_PKEY_asn1_get0_info.argtypes=(POINTER(c_int),POINTER(c_int),POINTER(c_int),POINTER(c_char_p), POINTER(c_char_p),c_void_p)
+libcrypto.EVP_PKEY_cmp.restype=c_int
+libcrypto.EVP_PKEY_cmp.argtypes=(c_void_p,c_void_p)
+libcrypto.EVP_PKEY_CTX_ctrl_str.restype=c_int
+libcrypto.EVP_PKEY_CTX_ctrl_str.argtypes=(c_void_p,)
+libcrypto.EVP_PKEY_CTX_free.argtypes=(c_void_p,)
+libcrypto.EVP_PKEY_CTX_new.restype=c_void_p
+libcrypto.EVP_PKEY_CTX_new.argtypes=(c_void_p,c_void_p)
+libcrypto.EVP_PKEY_CTX_new_id.restype=c_void_p
+libcrypto.EVP_PKEY_CTX_new_id.argtypes=(c_int,c_void_p)
+libcrypto.EVP_PKEY_derive.restype=c_int
+libcrypto.EVP_PKEY_derive.argtypes=(c_void_p,c_char_p,POINTER(c_long))
+libcrypto.EVP_PKEY_derive_init.restype=c_int
+libcrypto.EVP_PKEY_derive_init.argtypes=(c_void_p,)
+libcrypto.EVP_PKEY_derive_set_peer.restype=c_int
+libcrypto.EVP_PKEY_derive_set_peer.argtypes=(c_void_p,c_void_p)
+libcrypto.EVP_PKEY_free.argtypes=(c_void_p,)
+libcrypto.EVP_PKEY_keygen.restype=c_int
+libcrypto.EVP_PKEY_keygen.argtypes=(c_void_p,c_void_p)
+libcrypto.EVP_PKEY_keygen_init.restype=c_int
+libcrypto.EVP_PKEY_keygen_init.argtypes=(c_void_p,)
+libcrypto.EVP_PKEY_sign.restype=c_int
+libcrypto.EVP_PKEY_sign.argtypes=(c_void_p,c_char_p,POINTER(c_long),c_char_p,c_long)
+libcrypto.EVP_PKEY_sign_init.restype=c_int
+libcrypto.EVP_PKEY_sign_init.argtypes=(c_void_p,)
+libcrypto.EVP_PKEY_verify.restype=c_int
+libcrypto.EVP_PKEY_verify.argtypes=(c_void_p,c_char_p,c_long,c_char_p,c_long)
+libcrypto.EVP_PKEY_verify_init.restype=c_int
+libcrypto.EVP_PKEY_verify_init.argtypes=(c_void_p,)
+