Remove stale SM2 error codes

Run `make update ERROR_REBUILD=-rebuild` to remove some stale error
codes for SM2 (which is now using its own submodule for error codes,
i.e., `SM2_*`).

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6690)

diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c
index 342b84fecb02c13f6737535b3c61d39bc1e9ac99..b0bd3be2c1fb930a5bb43f12deae5eb6d4e636bc 100644 (file)
--- a/crypto/ec/ec_err.c
+++ b/crypto/ec/ec_err.c
@@ -261,12 +261,6 @@ static const ERR_STRING_DATA EC_str_functs[] = {
     {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_EC_KEYGEN, 0), "pkey_ec_keygen"},
     {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_EC_PARAMGEN, 0), "pkey_ec_paramgen"},
     {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_EC_SIGN, 0), "pkey_ec_sign"},
-    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_CTRL, 0), "pkey_sm2_ctrl"},
-    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_CTRL_STR, 0), "pkey_sm2_ctrl_str"},
-    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_INIT, 0), "pkey_sm2_init"},
-    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_KEYGEN, 0), "pkey_sm2_keygen"},
-    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_PARAMGEN, 0), "pkey_sm2_paramgen"},
-    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_SIGN, 0), "pkey_sm2_sign"},
     {ERR_PACK(ERR_LIB_EC, EC_F_VALIDATE_ECX_DERIVE, 0), "validate_ecx_derive"},
     {0, NULL}
 };

diff --git a/crypto/include/internal/sm2err.h b/crypto/include/internal/sm2err.h
index f32d26c04ba77af604b0966eba489932818290e4..9a7e2b62758cddb5e7c5b1d4eda1997fe6c52994 100644 (file)
--- a/crypto/include/internal/sm2err.h
+++ b/crypto/include/internal/sm2err.h
@@ -15,6 +15,9 @@
 
 # ifndef OPENSSL_NO_SM2
 
+#  ifdef  __cplusplus
+extern "C"
+#  endif
 int ERR_load_SM2_strings(void);
 
 /*

diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h
index ac6bdcd038b376c1f5553ca2220313bb1c283d08..a54a18545e3c75bf5bc16bc144dcbe51a1734eb7 100644 (file)
--- a/include/internal/dsoerr.h
+++ b/include/internal/dsoerr.h
@@ -15,6 +15,9 @@
 
 # ifndef OPENSSL_NO_DSO
 
+#  ifdef  __cplusplus
+extern "C"
+#  endif
 int ERR_load_DSO_strings(void);
 
 /*

diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h
index 8db7967697eafe00c0dcf5ba1debd27ae21fedd4..6ed80ca5e6972d78eea45f65bb7657a3cf4445ed 100644 (file)
--- a/include/openssl/ecerr.h
+++ b/include/openssl/ecerr.h
@@ -183,12 +183,6 @@ int ERR_load_EC_strings(void);
 #  define EC_F_PKEY_EC_KEYGEN                              199
 #  define EC_F_PKEY_EC_PARAMGEN                            219
 #  define EC_F_PKEY_EC_SIGN                                218
-#  define EC_F_PKEY_SM2_CTRL                               284
-#  define EC_F_PKEY_SM2_CTRL_STR                           285
-#  define EC_F_PKEY_SM2_INIT                               287
-#  define EC_F_PKEY_SM2_KEYGEN                             288
-#  define EC_F_PKEY_SM2_PARAMGEN                           289
-#  define EC_F_PKEY_SM2_SIGN                               290
 #  define EC_F_VALIDATE_ECX_DERIVE                         278
 
 /*