diff options
author | Richard Levitte <levitte@openssl.org> | 2020-03-10 22:50:22 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-03-15 19:42:04 +0100 |
commit | 70a7dd6f96c28a1a3059bf3d175bfb24449202ae (patch) | |
tree | bed8cc22e8013b51568f4b8cf3e04bf55891bf6e /util | |
parent | a5ce329eb496eb7ae17d6198dac51c2ab417550e (diff) |
X509: Rename X509_set0_sm2_id() and friends
- X509_set0_sm2_id() -> X509_set0_distinguishing_id()
- X509_get0_sm2_id() -> X509_get0_distinguishing_id()
- X509_REQ_set0_sm2_id -> X509_REQ_set0_distinguishing_id()
- X509_REQ_get0_sm2_id -> X509_REQ_get0_distinguishing_id()
The reason for this rename is that the SM2 ID isn't really a unique
SM2 data item, but rather a re-use of the Distinguished that is
defined in ISO/IEC 15946-3 as well as in FIPS 196, with no special
attribution toward any algorithm in particular.
Fixes #11293
Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
(Merged from https://github.com/openssl/openssl/pull/11302)
Diffstat (limited to 'util')
-rw-r--r-- | util/libcrypto.num | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 30978d2fb0..5f30a779fc 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4604,8 +4604,8 @@ OSSL_PARAM_get_utf8_ptr ? 3_0_0 EXIST::FUNCTION: OSSL_PARAM_set_utf8_ptr ? 3_0_0 EXIST::FUNCTION: OSSL_PARAM_get_octet_ptr ? 3_0_0 EXIST::FUNCTION: OSSL_PARAM_set_octet_ptr ? 3_0_0 EXIST::FUNCTION: -X509_set0_sm2_id ? 3_0_0 EXIST::FUNCTION:SM2 -X509_get0_sm2_id ? 3_0_0 EXIST::FUNCTION:SM2 +X509_set0_distinguishing_id ? 3_0_0 EXIST::FUNCTION: +X509_get0_distinguishing_id ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_get0_engine ? 3_0_0 EXIST::FUNCTION:ENGINE EVP_MD_up_ref ? 3_0_0 EXIST::FUNCTION: EVP_MD_fetch ? 3_0_0 EXIST::FUNCTION: @@ -4650,8 +4650,8 @@ BN_CTX_new_ex ? 3_0_0 EXIST::FUNCTION: BN_CTX_secure_new_ex ? 3_0_0 EXIST::FUNCTION: OPENSSL_thread_stop_ex ? 3_0_0 EXIST::FUNCTION: OSSL_PARAM_locate_const ? 3_0_0 EXIST::FUNCTION: -X509_REQ_set0_sm2_id ? 3_0_0 EXIST::FUNCTION:SM2 -X509_REQ_get0_sm2_id ? 3_0_0 EXIST::FUNCTION:SM2 +X509_REQ_set0_distinguishing_id ? 3_0_0 EXIST::FUNCTION: +X509_REQ_get0_distinguishing_id ? 3_0_0 EXIST::FUNCTION: BN_rand_ex ? 3_0_0 EXIST::FUNCTION: BN_priv_rand_ex ? 3_0_0 EXIST::FUNCTION: BN_rand_range_ex ? 3_0_0 EXIST::FUNCTION: |