summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2014-10-31 10:55:14 -0700
committerAdam Langley <agl@google.com>2014-10-31 18:25:06 +0000
commite6def376fe0458beebab27289ade2b0da37a8e1e (patch)
treefd39dc7f90aac6439edb71b7d7ef7a30ad9b28cd
parent03a739d8d2cdc2560531a7446ead0f705409670a (diff)
downloadsrc-e6def376fe0458beebab27289ade2b0da37a8e1e.tar.gz
Remove ERR_LIB_PKCS12.
This is no longer used but, by retaining it, we might miss cases where code is still testing against it. Change-Id: I40ed47e41f903aaf2c5e5354d4348f8890021382 Reviewed-on: https://boringssl-review.googlesource.com/2110 Reviewed-by: David Benjamin <davidben@chromium.org> Reviewed-by: Adam Langley <agl@google.com>
-rw-r--r--crypto/err/err.c1
-rw-r--r--include/openssl/err.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 3c5ea99..d0425d8 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -645,7 +645,6 @@ static const char *const kLibraryNames[ERR_NUM_LIBS] = {
"PKCS7 routines", /* ERR_LIB_PKCS7 */
"PKCS8 routines", /* ERR_LIB_PKCS8 */
"X509 V3 routines", /* ERR_LIB_X509V3 */
- "PKCS12 routines", /* ERR_LIB_PKCS12 */
"random number generator", /* ERR_LIB_RAND */
"ENGINE routines", /* ERR_LIB_ENGINE */
"OCSP routines", /* ERR_LIB_OCSP */
diff --git a/include/openssl/err.h b/include/openssl/err.h
index a7f30c7..b9c48c3 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -392,7 +392,6 @@ enum {
ERR_LIB_PKCS7,
ERR_LIB_PKCS8,
ERR_LIB_X509V3,
- ERR_LIB_PKCS12,
ERR_LIB_RAND,
ERR_LIB_ENGINE,
ERR_LIB_OCSP,
@@ -426,7 +425,6 @@ enum {
#define ERR_R_PKCS7_LIB ERR_LIB_PKCS7
#define ERR_R_PKCS8_LIB ERR_LIB_PKCS8
#define ERR_R_X509V3_LIB ERR_LIB_X509V3
-#define ERR_R_PKCS12_LIB ERR_LIB_PKCS12
#define ERR_R_RAND_LIB ERR_LIB_RAND
#define ERR_R_DSO_LIB ERR_LIB_DSO
#define ERR_R_ENGINE_LIB ERR_LIB_ENGINE