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 /include/crypto/x509.h | |
| 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 'include/crypto/x509.h')
| -rw-r--r-- | include/crypto/x509.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/crypto/x509.h b/include/crypto/x509.h index 602a72fd27..edd85b6db0 100644 --- a/include/crypto/x509.h +++ b/include/crypto/x509.h @@ -71,9 +71,9 @@ struct X509_req_st { ASN1_BIT_STRING *signature; /* signature */ CRYPTO_REF_COUNT references; CRYPTO_RWLOCK *lock; -# ifndef OPENSSL_NO_SM2 - ASN1_OCTET_STRING *sm2_id; -# endif + + /* Set on live certificates for authentication purposes */ + ASN1_OCTET_STRING *distinguishing_id; }; struct X509_crl_info_st { @@ -186,9 +186,9 @@ struct x509_st { X509_CERT_AUX *aux; CRYPTO_RWLOCK *lock; volatile int ex_cached; -# ifndef OPENSSL_NO_SM2 - ASN1_OCTET_STRING *sm2_id; -# endif + + /* Set on live certificates for authentication purposes */ + ASN1_OCTET_STRING *distinguishing_id; } /* X509 */ ; /* |