Merge branch 'master' of https://github.com/vbwagner/ctypescrypto

diff --git a/ctypescrypto/engine.py b/ctypescrypto/engine.py
index f5bdb7514f007ba6f10e0ae3dadb800a53328e90..79f6218aa0a3beee5558bec9f357d9f1cb47cd5d 100644 (file)
--- a/ctypescrypto/engine.py
+++ b/ctypescrypto/engine.py
@@ -69,3 +69,7 @@ libcrypto.ENGINE_set_default.argtypes = (c_void_p, c_int)
 libcrypto.ENGINE_ctrl_cmd_string.argtypes = (c_void_p, c_char_p, c_char_p,
                                              c_int)
 libcrypto.ENGINE_finish.argtypes = (c_char_p, )
+libcrypto.ENGINE_init.argtypes = (c_void_p, )
+libcrypto.UI_OpenSSL.restype = c_void_p
+libcrypto.ENGINE_load_private_key.argtypes = (c_void_p, c_char_p, c_void_p, c_void_p)
+libcrypto.ENGINE_load_private_key.restype = c_void_p

diff --git a/tests/testec.py b/tests/testec.py
index c5054a52ada4e3a9730d4640a2c64bedbd3adc1f..ccf289cfe16922f7c09d5705ec3cd243f83e6768 100644 (file)
--- a/tests/testec.py
+++ b/tests/testec.py
@@ -35,10 +35,12 @@ cUqktWYGr/GB65Zr5Ky1z/nha2bYCb6U4hTwbJP9CRCZr5hJklXn
             
         out=key.exportpriv()
         self.assertEqual(dump_key(out),dump_key(self.ec1priv))
+        self.assertEqual(str(key),dump_pub_key(self.ec1priv))
 
     def test_bignum(self):
         keyval='\xff'*32
         key=create(Oid("secp256k1"),keyval)
         self.assertEqual(dump_key(key.exportpriv()),dump_key(self.bigkey))
+        self.assertEqual(str(key),dump_pub_key(self.bigkey))
 if __name__ == "__main__":
     unittest.main()