From 89574f6f95fce6985ec405548ede24a0ecfec82d Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Thu, 23 Feb 2017 17:27:49 +0800 Subject: [PATCH] update sm2 kmeth --- crypto/sm2/sm2_kmeth.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/crypto/sm2/sm2_kmeth.c b/crypto/sm2/sm2_kmeth.c index b05fa22e..f47444ae 100644 --- a/crypto/sm2/sm2_kmeth.c +++ b/crypto/sm2/sm2_kmeth.c @@ -58,8 +58,6 @@ #define SM2_KMETH_FLAGS 0 -extern EC_KEY_METHOD *default_ec_key_meth; - int SM2_ENC_PARAMS_set_type(SM2_ENC_PARAMS *params, int type) { // FIXME: @@ -193,32 +191,15 @@ const EC_KEY_METHOD *EC_KEY_GmSSL(void) return &gmssl_ec_key_method; } -const EC_KEY_METHOD *EC_KEY_get_default_secg_method(void) +int EC_KEY_METHOD_type(const EC_KEY_METHOD *meth) { - return EC_KEY_OpenSSL(); + if (meth->flags & EC_KEY_METHOD_SM2) { + return NID_sm_scheme; + } else { + return NID_secg_scheme; + } } -const EC_KEY_METHOD *EC_KEY_get_default_sm_method(void) -{ - return EC_KEY_GmSSL(); -} - -void EC_KEY_set_default_secg_method(const EC_KEY_METHOD *meth) -{ - if (meth == NULL) - default_ec_key_meth = EC_KEY_OpenSSL(); - else - default_ec_key_meth = meth; - -} - -void EC_KEY_set_default_sm_method(const EC_KEY_METHOD *meth) -{ - if (meth == NULL) - default_ec_key_meth = EC_KEY_GmSSL(); - else - default_ec_key_meth = meth; -} void EC_KEY_METHOD_set_encrypt(EC_KEY_METHOD *meth, int (*encrypt)(int type,