Skip to content

Commit 5b90476

Browse files
guanzhiguanzhi
committed
Add new EC/SM2 API
1 parent bf4c692 commit 5b90476

14 files changed

Lines changed: 6220 additions & 5435 deletions

File tree

‎crypto/ec/build.info‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SOURCE[../../libcrypto]=\
66
ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c \
77
ecp_oct.c ec2_oct.c ec_oct.c ec_kmeth.c ecdh_ossl.c ecdh_kdf.c \
88
ecdsa_ossl.c ecdsa_sign.c ecdsa_vrf.c curve25519.c ecx_meth.c \
9-
{- $target{ec_asm_src} -}
9+
{- $target{ec_asm_src} -} ecahe.c
1010

1111
GENERATE[ecp_nistz256-x86.s]=asm/ecp_nistz256-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
1212

‎crypto/ec/ec_err.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ static ERR_STRING_DATA EC_str_functs[] = {
2525
{ERR_FUNC(EC_F_D2I_ECPKPARAMETERS), "d2i_ECPKParameters"},
2626
{ERR_FUNC(EC_F_D2I_ECPRIVATEKEY), "d2i_ECPrivateKey"},
2727
{ERR_FUNC(EC_F_DO_EC_KEY_PRINT), "do_EC_KEY_print"},
28+
{ERR_FUNC(EC_F_ECAHE_CIPHERTEXT_SIZE), "ECAHE_ciphertext_size"},
29+
{ERR_FUNC(EC_F_ECAHE_DECRYPT), "ECAHE_decrypt"},
30+
{ERR_FUNC(EC_F_ECAHE_ENCRYPT), "ECAHE_encrypt"},
2831
{ERR_FUNC(EC_F_ECDH_CMS_DECRYPT), "ecdh_cms_decrypt"},
2932
{ERR_FUNC(EC_F_ECDH_CMS_SET_SHARED_INFO), "ecdh_cms_set_shared_info"},
3033
{ERR_FUNC(EC_F_ECDH_COMPUTE_KEY), "ECDH_compute_key"},
@@ -169,6 +172,7 @@ static ERR_STRING_DATA EC_str_functs[] = {
169172
{ERR_FUNC(EC_F_EC_KEY_CHECK_KEY), "EC_KEY_check_key"},
170173
{ERR_FUNC(EC_F_EC_KEY_COPY), "EC_KEY_copy"},
171174
{ERR_FUNC(EC_F_EC_KEY_GENERATE_KEY), "EC_KEY_generate_key"},
175+
{ERR_FUNC(EC_F_EC_KEY_MERGE), "EC_KEY_merge"},
172176
{ERR_FUNC(EC_F_EC_KEY_NEW_METHOD), "EC_KEY_new_method"},
173177
{ERR_FUNC(EC_F_EC_KEY_OCT2PRIV), "EC_KEY_oct2priv"},
174178
{ERR_FUNC(EC_F_EC_KEY_PRINT_FP), "EC_KEY_print_fp"},

‎crypto/ec/ec_key.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,3 +737,9 @@ STACK_OF(EC_KEY) *EC_KEY_split(EC_KEY *ec_key, int k, int n)
737737
BN_CTX_free(bn_ctx);
738738
return ret;
739739
}
740+
741+
EC_KEY *EC_KEY_merge(STACK_OF(EC_KEY) *ec_keys)
742+
{
743+
ECerr(EC_F_EC_KEY_MERGE, EC_R_NOT_IMPLEMENTED);
744+
return NULL;
745+
}

0 commit comments

Comments
 (0)