tests ecdsa. removing pyecdsa

merlokk · merlokk · commit 79ff36b04734 · 2020-06-14T19:01:10.000+03:00
diff --git a/pytest/ecdsa_keys.py b/pytest/ecdsa_keys.py
@@ -129,10 +129,11 @@ def calc_fpr_ecdsa(n):
 
 
 def generate_key_ecdsa(ecdsa_curve):
-    curve = find_curve_oid_hex(ecdsa_curve)
+    curve = ec.get_curve_for_oid(get_curve_by_hex_oid(ecdsa_curve))
     assert not(curve is None)
-    PrivateKey = ecdsa.SigningKey.generate(curve, hashfunc=sha256)
-    PublicKey = PrivateKey.get_verifying_key()
+
+    PrivateKey = ec.generate_private_key(curve(), default_backend())
+    PublicKey = PrivateKey.public_key()
     return PublicKey, PrivateKey
 
 
@@ -156,7 +157,8 @@ def build_privkey_template_ecdsa(openpgp_keyno, ecdsa_curve):
         keyspec = 0xa4
 
     PublicKey, PrivateKey = generate_key_ecdsa(ecdsa_curve)
-    return create_ecdsa_4D_key(keyspec, PrivateKey.to_string(), b"\x04" + PublicKey.to_string())
+    return create_ecdsa_4D_key(keyspec, ecc_to_string(PrivateKey),
+                               ecc_to_string(PublicKey))
 
 
 def int_to_binstr(vint, size=None):
@@ -199,10 +201,10 @@ def ecc_to_string(key):
             serialization.PublicFormat.Raw)
 
     if isinstance(key, ec.EllipticCurvePrivateKey):
-        return key.private_bytes(
-                  serialization.Encoding.Raw,
-                  serialization.PrivateFormat.Raw,
-                  serialization.NoEncryption())
+        numbers = key.private_numbers()
+        keysize = curve_keysize_bytes(numbers.public_numbers.curve)
+        print(numbers.private_value, keysize, int_to_binstr(numbers.private_value, keysize).hex())
+        return int_to_binstr(numbers.private_value, keysize)
 
     if isinstance(key, ec.EllipticCurvePublicKey):
         numbers = key.public_numbers()
diff --git a/pytest/test_035_ecdsa.py b/pytest/test_035_ecdsa.py
@@ -60,12 +60,14 @@ def ECDSACheckPublicKey(curve_oid, public_key):
 
 def check_ecdh(card, ECDSAcurve, key_num=2):
     myPublicKey, myPrivateKey = ecdsa_keys.generate_key_ecdsa(ECDSAcurve)
-    myPublicKeyTLV = ecdh_public_key_encode(b"\x04" + myPublicKey.to_string())
+    myPublicKeyTLV = ecdh_public_key_encode(
+        ecdsa_keys.ecc_to_string(myPublicKey))
 
-    pk = card.cmd_get_public_key(2)
+    pk = card.cmd_get_public_key(key_num)
     pk_info = get_pk_info(pk)
 
-    mySharedSecret = ecdsa_keys.ecdh(ECDSAcurve, myPrivateKey.to_string(),
+    mySharedSecret = ecdsa_keys.ecdh(ECDSAcurve,
+                                     ecdsa_keys.ecc_to_string(myPrivateKey),
                                      pk_info[0])
 
     sharedSecret = card.cmd_pso(0x80, 0x86, myPublicKeyTLV)
