X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ctypescrypto%2Fec.py;h=047aad97a1d6db7225d8f6b5c967647df364ba22;hb=ec92bf04b008b0401014cae90fa2dfca18efa02c;hp=d325212c7781d196b1d416575436a5e1845005fe;hpb=b4ee51a0aca14c0af5853545b9e524cc1b57b656;p=oss%2Fctypescrypto.git

diff --git a/ctypescrypto/ec.py b/ctypescrypto/ec.py
index d325212..047aad9 100644
--- a/ctypescrypto/ec.py
+++ b/ctypescrypto/ec.py
@@ -1,33 +1,79 @@
 """
 Support for EC keypair operation missing form public libcrypto API
 """
+from ctypescrypto.pkey import PKey, PKeyError
+from ctypes import c_void_p,c_char_p,c_int,byref
+from ctypescrypto import libcrypto
 
+__all__ = [ 'create']
 
-def create(curve,num):
+def create(curve,data):
 	"""
 		Creates EC keypair from the just secret key and curve name
 		
 		@param curve - name of elliptic curve
-		@param num - long number representing key
+		@param num - byte array or long number representing key
 	"""
-	p=libcrypto.EVP_PKEY_new()
-	ec=libcrypto.EC_KEY_new_by_curvename(curve.nid)
+	ec=libcrypto.EC_KEY_new_by_curve_name(curve.nid)
+	if ec is None:	
+		raise PKeyError("EC_KEY_new_by_curvename")
 	group=libcrypto.EC_KEY_get0_group(ec)
-	EC_KEY_set_private_key(ec,bn)
-	priv_key=libcrypt.BN_new()
-	ctx=BN_CTX_new()
-	h="%x"%(num)
-	libcrypto.BN_hex2bn(byref(priv_key),h)
-	libcrypto.EC_KEY_set_private_key(ec,priv_key)
+	if group is None:
+		raise PKeyError("EC_KEY_get0_group")
+	libcrypto.EC_GROUP_set_asn1_flag(group,1)
+	raw_key=libcrypto.BN_new()
+	if isinstance(data,int):
+		BN_hex2bn(byref(raw_key),hex(data))
+	else:
+		if raw_key is None:
+			raise PKeyError("BN_new")
+		if libcrypto.BN_bin2bn(data,len(data),raw_key) is None:
+			raise PKeyError("BN_bin2bn")
+	ctx=libcrypto.BN_CTX_new()
+	if ctx is None:
+		raise PKeyError("BN_CTX_new")
+	order=libcrypto.BN_new()
+	if order is None:
+		raise PKeyError("BN_new")
+	priv_key = libcrypto.BN_new()
+	if priv_key is None:
+		raise PKeyError("BN_new")
+	if libcrypto.EC_GROUP_get_order(group,order,ctx) <=0:
+		raise PKeyError("EC_GROUP_get_order")
+	if libcrypto.BN_nnmod(priv_key,raw_key,order,ctx) <=0:
+		raise PKeyError("BN_nnmod")
+	if libcrypto.EC_KEY_set_private_key(ec,priv_key)<=0:
+		raise PKeyError("EC_KEY_set_private_key")
 	pub_key=libcrypto.EC_POINT_new(group)
-	libcrypto.EC_POINT_mul(group,pub_key,priv_key,None,None,ctx)
-	libcrypto.BN_free(a)
-	libcrypto.EVP_PKEY_set1_EC_KEY(p,ec)
+	if pub_key is None:
+		raise PKeyError("EC_POINT_new")
+	if libcrypto.EC_POINT_mul(group,pub_key,priv_key,None,None,ctx)<=0:
+		raise PKeyError("EC_POINT_mul")
+	if libcrypto.EC_KEY_set_public_key(ec,pub_key)<=0:
+		raise PKeyError("EC_KEY_set_public_key")
+	libcrypto.BN_free(raw_key)
+	libcrypto.BN_free(order)
+	libcrypto.BN_free(priv_key)
+	libcrypto.BN_CTX_free(ctx)
+	p=libcrypto.EVP_PKEY_new()
+	if p is None:
+		raise PKeyError("EVP_PKEY_new")	
+	if libcrypto.EVP_PKEY_set1_EC_KEY(p,ec)<=0:
+		raise PKeyError("EVP_PKEY_set1_EC_KEY")
 	libcrypto.EC_KEY_free(ec)
 	return PKey(ptr=p,cansign=True)
 
 
 libcrypto.EVP_PKEY_new.restype=c_void_p
 libcrypto.BN_new.restype=c_void_p
-libcrypto.BN_hex2bn.argtypes(POINTER(c_void_p),c_char_p)
-libcrypto.EC_KEY_set_private_key
+libcrypto.BN_free.argtypes=(c_void_p,)
+libcrypto.BN_CTX_new.restype=c_void_p
+libcrypto.BN_CTX_free.argtypes=(c_void_p,)
+libcrypto.BN_bin2bn.argtypes=(c_char_p,c_int,c_void_p)
+libcrypto.EC_KEY_set_private_key.argtypes=(c_void_p,c_void_p)
+libcrypto.EC_POINT_new.argtypes=(c_void_p,)
+libcrypto.EC_POINT_new.restype=c_void_p
+libcrypto.EC_POINT_mul.argtypes=(c_void_p,c_void_p,c_void_p,c_void_p,c_void_p,c_void_p)
+libcrypto.EC_KEY_set_public_key.argtypes=(c_void_p,c_void_p)
+
+