Send the function codes from the error functions to the bit bucket,

as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@

1 files changed, 2 insertions, 41 deletions

diff --git a/src/lib/libcrypto/pem/pem_err.c b/src/lib/libcrypto/pem/pem_err.c
index c3d0fa3576..8d3c278b54 100644
--- a/src/lib/libcrypto/pem/pem_err.c
+++ b/src/lib/libcrypto/pem/pem_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_err.c,v 1.11 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: pem_err.c,v 1.12 2017/01/29 17:49:23 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
  *
@@ -72,46 +72,7 @@
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_PEM,0,reason)
 
 static ERR_STRING_DATA PEM_str_functs[] = {
-        {ERR_FUNC(PEM_F_B2I_DSS),       "B2I_DSS"},
-        {ERR_FUNC(PEM_F_B2I_PVK_BIO),   "b2i_PVK_bio"},
-        {ERR_FUNC(PEM_F_B2I_RSA),       "B2I_RSA"},
-        {ERR_FUNC(PEM_F_CHECK_BITLEN_DSA),      "CHECK_BITLEN_DSA"},
-        {ERR_FUNC(PEM_F_CHECK_BITLEN_RSA),      "CHECK_BITLEN_RSA"},
-        {ERR_FUNC(PEM_F_D2I_PKCS8PRIVATEKEY_BIO),       "d2i_PKCS8PrivateKey_bio"},
-        {ERR_FUNC(PEM_F_D2I_PKCS8PRIVATEKEY_FP),        "d2i_PKCS8PrivateKey_fp"},
-        {ERR_FUNC(PEM_F_DO_B2I),        "DO_B2I"},
-        {ERR_FUNC(PEM_F_DO_B2I_BIO),    "DO_B2I_BIO"},
-        {ERR_FUNC(PEM_F_DO_BLOB_HEADER),        "DO_BLOB_HEADER"},
-        {ERR_FUNC(PEM_F_DO_PK8PKEY),    "DO_PK8PKEY"},
-        {ERR_FUNC(PEM_F_DO_PK8PKEY_FP), "DO_PK8PKEY_FP"},
-        {ERR_FUNC(PEM_F_DO_PVK_BODY),   "DO_PVK_BODY"},
-        {ERR_FUNC(PEM_F_DO_PVK_HEADER), "DO_PVK_HEADER"},
-        {ERR_FUNC(PEM_F_I2B_PVK),       "I2B_PVK"},
-        {ERR_FUNC(PEM_F_I2B_PVK_BIO),   "i2b_PVK_bio"},
-        {ERR_FUNC(PEM_F_LOAD_IV),       "LOAD_IV"},
-        {ERR_FUNC(PEM_F_PEM_ASN1_READ), "PEM_ASN1_read"},
-        {ERR_FUNC(PEM_F_PEM_ASN1_READ_BIO),     "PEM_ASN1_read_bio"},
-        {ERR_FUNC(PEM_F_PEM_ASN1_WRITE),        "PEM_ASN1_write"},
-        {ERR_FUNC(PEM_F_PEM_ASN1_WRITE_BIO),    "PEM_ASN1_write_bio"},
-        {ERR_FUNC(PEM_F_PEM_DEF_CALLBACK),      "PEM_def_callback"},
-        {ERR_FUNC(PEM_F_PEM_DO_HEADER), "PEM_do_header"},
-        {ERR_FUNC(PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY),       "PEM_F_PEM_WRITE_PKCS8PRIVATEKEY"},
-        {ERR_FUNC(PEM_F_PEM_GET_EVP_CIPHER_INFO),       "PEM_get_EVP_CIPHER_INFO"},
-        {ERR_FUNC(PEM_F_PEM_PK8PKEY),   "PEM_PK8PKEY"},
-        {ERR_FUNC(PEM_F_PEM_READ),      "PEM_read"},
-        {ERR_FUNC(PEM_F_PEM_READ_BIO),  "PEM_read_bio"},
-        {ERR_FUNC(PEM_F_PEM_READ_BIO_PARAMETERS),       "PEM_read_bio_Parameters"},
-        {ERR_FUNC(PEM_F_PEM_READ_BIO_PRIVATEKEY),       "PEM_READ_BIO_PRIVATEKEY"},
-        {ERR_FUNC(PEM_F_PEM_READ_PRIVATEKEY),   "PEM_READ_PRIVATEKEY"},
-        {ERR_FUNC(PEM_F_PEM_SEALFINAL), "PEM_SealFinal"},
-        {ERR_FUNC(PEM_F_PEM_SEALINIT),  "PEM_SealInit"},
-        {ERR_FUNC(PEM_F_PEM_SIGNFINAL), "PEM_SignFinal"},
-        {ERR_FUNC(PEM_F_PEM_WRITE),     "PEM_write"},
-        {ERR_FUNC(PEM_F_PEM_WRITE_BIO), "PEM_write_bio"},
-        {ERR_FUNC(PEM_F_PEM_WRITE_PRIVATEKEY),  "PEM_WRITE_PRIVATEKEY"},
-        {ERR_FUNC(PEM_F_PEM_X509_INFO_READ),    "PEM_X509_INFO_read"},
-        {ERR_FUNC(PEM_F_PEM_X509_INFO_READ_BIO),        "PEM_X509_INFO_read_bio"},
-        {ERR_FUNC(PEM_F_PEM_X509_INFO_WRITE_BIO),       "PEM_X509_INFO_write_bio"},
+        {ERR_FUNC(0xfff), "CRYPTO_internal"},
         {0, NULL}
 };