Guard some SM2 functions with OPENSSL_NO_SM2

Fixes the no-ec build

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8481)

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index ace3fb05a7dee08046be37a305d345b968854535..4de88bd57beb0f8fd7de12a940246c08a497c3fc 100644 (file)
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -566,8 +566,10 @@ void X509_get0_signature(const ASN1_BIT_STRING **psig,
                          const X509_ALGOR **palg, const X509 *x);
 int X509_get_signature_nid(const X509 *x);
 
+# ifndef OPENSSL_NO_SM2
 void X509_set_sm2_id(X509 *x, ASN1_OCTET_STRING *sm2_id);
 ASN1_OCTET_STRING *X509_get0_sm2_id(X509 *x);
+# endif
 
 int X509_trusted(const X509 *x);
 int X509_alias_set1(X509 *x, const unsigned char *name, int len);

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 817c8bbaf43bcffc645a11a6af287834aa6e01b1..711ccd92a3094c8d794d1b757b21079190a44d8c 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4788,5 +4788,5 @@ OSSL_PARAM_get_utf8_ptr                 4735      3_0_0   EXIST::FUNCTION:
 OSSL_PARAM_set_utf8_ptr                 4736   3_0_0   EXIST::FUNCTION:
 OSSL_PARAM_get_octet_ptr                4737   3_0_0   EXIST::FUNCTION:
 OSSL_PARAM_set_octet_ptr                4738   3_0_0   EXIST::FUNCTION:
-X509_set_sm2_id                         4739   3_0_0   EXIST::FUNCTION:
-X509_get0_sm2_id                        4740   3_0_0   EXIST::FUNCTION:
+X509_set_sm2_id                         4739   3_0_0   EXIST::FUNCTION:SM2
+X509_get0_sm2_id                        4740   3_0_0   EXIST::FUNCTION:SM2