@@ -331,15 +331,21 @@ def get_openssl_messagedigest_arg(self):
331331 # sig: 5:OpenSSL->python 6:python->OpenSSL
332332
333333 def test_from_openssl_nist192p (self ):
334- return self .do_test_from_openssl (NIST192p , "prime192v1" )
334+ return self .do_test_from_openssl (NIST192p )
335335 def test_from_openssl_nist224p (self ):
336- return self .do_test_from_openssl (NIST224p , "secp224r1" )
336+ return self .do_test_from_openssl (NIST224p )
337+ def test_from_openssl_nist256p (self ):
338+ return self .do_test_from_openssl (NIST256p )
337339 def test_from_openssl_nist384p (self ):
338- return self .do_test_from_openssl (NIST384p , "secp384r1" )
340+ return self .do_test_from_openssl (NIST384p )
339341 def test_from_openssl_nist521p (self ):
340- return self .do_test_from_openssl (NIST521p , "secp521r1" )
342+ return self .do_test_from_openssl (NIST521p )
343+ def test_from_openssl_secp256k1 (self ):
344+ return self .do_test_from_openssl (SECP256k1 )
341345
342- def do_test_from_openssl (self , curve , curvename ):
346+ def do_test_from_openssl (self , curve ):
347+ curvename = curve .openssl_name
348+ assert curvename
343349 # OpenSSL: create sk, vk, sign.
344350 # Python: read vk(3), checksig(5), read sk(1), sign, check
345351 mdarg = self .get_openssl_messagedigest_arg ()
@@ -364,15 +370,21 @@ def do_test_from_openssl(self, curve, curvename):
364370 self .assertTrue (vk .verify (sig , data ))
365371
366372 def test_to_openssl_nist192p (self ):
367- self .do_test_to_openssl (NIST192p , "prime192v1" )
373+ self .do_test_to_openssl (NIST192p )
368374 def test_to_openssl_nist224p (self ):
369- self .do_test_to_openssl (NIST224p , "secp224r1" )
375+ self .do_test_to_openssl (NIST224p )
376+ def test_to_openssl_nist256p (self ):
377+ self .do_test_to_openssl (NIST256p )
370378 def test_to_openssl_nist384p (self ):
371- self .do_test_to_openssl (NIST384p , "secp384r1" )
379+ self .do_test_to_openssl (NIST384p )
372380 def test_to_openssl_nist521p (self ):
373- self .do_test_to_openssl (NIST521p , "secp521r1" )
381+ self .do_test_to_openssl (NIST521p )
382+ def test_to_openssl_secp256k1 (self ):
383+ self .do_test_to_openssl (SECP256k1 )
374384
375- def do_test_to_openssl (self , curve , curvename ):
385+ def do_test_to_openssl (self , curve ):
386+ curvename = curve .openssl_name
387+ assert curvename
376388 # Python: create sk, vk, sign.
377389 # OpenSSL: read vk(4), checksig(6), read sk(2), sign, check
378390 mdarg = self .get_openssl_messagedigest_arg ()
0 commit comments