Merge branch 'master' into master

This commit is contained in:
Simon
2017-04-14 16:57:24 +08:00
committed by GitHub
2 changed files with 51 additions and 1 deletions

View File

@@ -4928,4 +4928,4 @@ SM2CiphertextValue_new_from_ECCCipher 4872 1_1_0d EXIST::FUNCTION:
SM2CiphertextValue_set_ECCCipher 4873 1_1_0d EXIST::FUNCTION:
SM2CiphertextValue_get_ECCCIPHERBLOB 4874 1_1_0d EXIST::FUNCTION:
ECIES_PARAMS_init_with_type 4875 1_1_0d EXIST::FUNCTION:
BN_GFP2_one 4876 1_1_0d EXIST::FUNCTION:
BN_GFP2_one 4876 1_1_0d EXIST::FUNCTION: