Guard some SM2 functions with OPENSSL_NO_SM2
authorMatt Caswell <matt@openssl.org>
Thu, 14 Mar 2019 11:14:38 +0000 (11:14 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 15 Mar 2019 10:12:36 +0000 (10:12 +0000)
Fixes the no-ec build

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

include/openssl/x509.h
util/libcrypto.num

index ace3fb0..4de88bd 100644 (file)
@@ -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);
index 817c8bb..711ccd9 100644 (file)
@@ -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