summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNicola Tuveri <nic.tuv@gmail.com>2018-07-13 11:48:29 +0300
committerMatt Caswell <matt@openssl.org>2018-07-16 10:17:40 +0100
commit51f3021d974f32539a2727908018664963695b5d (patch)
tree0f94ffba67e4ba9a13c050b94ef74ed425b1f2a5 /include
parent3c849bc901fa191fc517bc20d905783e6e428de5 (diff)
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)
Diffstat (limited to 'include')
-rw-r--r--include/internal/dsoerr.h3
-rw-r--r--include/openssl/ecerr.h6
2 files changed, 3 insertions, 6 deletions
diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h
index ac6bdcd038..a54a18545e 100644
--- 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 8db7967697..6ed80ca5e6 100644
--- 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
/*