Rebuild ASN1 error codes to remove unused function and reason codes.

2 files changed, 46 insertions, 200 deletions

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 4bf15ba3fd..45b15bffd8 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -953,120 +953,45 @@ int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
 #define ASN1_F_BN_TO_ASN1_INTEGER			 139
 #define ASN1_F_COLLECT_DATA				 140
 #define ASN1_F_D2I_ASN1_BIT_STRING			 141
-#define ASN1_F_D2I_ASN1_BMPSTRING			 178
 #define ASN1_F_D2I_ASN1_BOOLEAN				 142
 #define ASN1_F_D2I_ASN1_BYTES				 143
 #define ASN1_F_D2I_ASN1_GENERALIZEDTIME			 144
 #define ASN1_F_D2I_ASN1_HEADER				 145
 #define ASN1_F_D2I_ASN1_INTEGER				 146
-#define ASN1_F_D2I_ASN1_NULL				 179
 #define ASN1_F_D2I_ASN1_OBJECT				 147
 #define ASN1_F_D2I_ASN1_SET				 148
 #define ASN1_F_D2I_ASN1_TYPE_BYTES			 149
 #define ASN1_F_D2I_ASN1_UINTEGER			 150
 #define ASN1_F_D2I_ASN1_UTCTIME				 151
-#define ASN1_F_D2I_ASN1_VISIBLESTRING			 180
-#define ASN1_F_D2I_DHPARAMS				 152
-#define ASN1_F_D2I_DSAPARAMS				 153
-#define ASN1_F_D2I_DSAPRIVATEKEY			 154
-#define ASN1_F_D2I_DSAPUBLICKEY				 155
-#define ASN1_F_D2I_NETSCAPE_RSA				 156
-#define ASN1_F_D2I_NETSCAPE_RSA_2			 157
-#define ASN1_F_D2I_OCSP_BASICRESP			 181
-#define ASN1_F_D2I_OCSP_CERTID				 182
-#define ASN1_F_D2I_OCSP_CERTSTATUS			 183
-#define ASN1_F_D2I_OCSP_CRLID				 184
-#define ASN1_F_D2I_OCSP_ONEREQ				 185
-#define ASN1_F_D2I_OCSP_REQINFO				 186
-#define ASN1_F_D2I_OCSP_REQUEST				 187
-#define ASN1_F_D2I_OCSP_RESPBYTES			 188
-#define ASN1_F_D2I_OCSP_RESPDATA			 189
-#define ASN1_F_D2I_OCSP_RESPID				 190
-#define ASN1_F_D2I_OCSP_RESPONSE			 191
-#define ASN1_F_D2I_OCSP_REVOKEDINFO			 192
-#define ASN1_F_D2I_OCSP_SERVICELOC			 193
-#define ASN1_F_D2I_OCSP_SIGNATURE			 194
-#define ASN1_F_D2I_OCSP_SINGLERESP			 195
-#define ASN1_F_D2I_PKCS12				 196
-#define ASN1_F_D2I_PKCS12_BAGS				 197
-#define ASN1_F_D2I_PKCS12_MAC_DATA			 198
-#define ASN1_F_D2I_PKCS12_SAFEBAG			 199
-#define ASN1_F_D2I_PKCS7				 200
-#define ASN1_F_D2I_PKCS7_DIGEST				 201
-#define ASN1_F_D2I_PKCS7_ENCRYPT			 202
-#define ASN1_F_D2I_PKCS7_ENC_CONTENT			 203
-#define ASN1_F_D2I_PKCS7_ENVELOPE			 204
-#define ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL		 205
-#define ASN1_F_D2I_PKCS7_RECIP_INFO			 206
-#define ASN1_F_D2I_PKCS7_SIGNED				 207
-#define ASN1_F_D2I_PKCS7_SIGNER_INFO			 208
-#define ASN1_F_D2I_PKCS7_SIGN_ENVELOPE			 209
-#define ASN1_F_D2I_PRIVATEKEY				 158
-#define ASN1_F_D2I_PUBLICKEY				 159
-#define ASN1_F_D2I_RSAPRIVATEKEY			 243
-#define ASN1_F_D2I_RSAPUBLICKEY				 244
-#define ASN1_F_D2I_X509					 210
-#define ASN1_F_D2I_X509_CINF				 211
-#define ASN1_F_D2I_X509_NAME				 160
-#define ASN1_F_D2I_X509_PKEY				 161
-#define ASN1_F_I2D_ASN1_TIME				 162
-#define ASN1_F_I2D_DHPARAMS				 163
-#define ASN1_F_I2D_DSAPARAMS				 164
-#define ASN1_F_I2D_DSAPRIVATEKEY			 165
-#define ASN1_F_I2D_DSAPUBLICKEY				 166
-#define ASN1_F_I2D_DSA_PUBKEY				 167
-#define ASN1_F_I2D_NETSCAPE_RSA				 168
-#define ASN1_F_I2D_PRIVATEKEY				 169
-#define ASN1_F_I2D_PUBLICKEY				 170
-#define ASN1_F_I2D_RSAPRIVATEKEY			 245
-#define ASN1_F_I2D_RSAPUBLICKEY				 246
-#define ASN1_F_I2D_RSA_PUBKEY				 171
-#define ASN1_F_LONG_C2I					 172
-#define ASN1_F_OCSP_BASICRESP_NEW			 212
-#define ASN1_F_OCSP_CERTID_NEW				 213
-#define ASN1_F_OCSP_CERTSTATUS_NEW			 214
-#define ASN1_F_OCSP_CRLID_NEW				 215
-#define ASN1_F_OCSP_ONEREQ_NEW				 216
-#define ASN1_F_OCSP_REQINFO_NEW				 217
-#define ASN1_F_OCSP_REQUEST_NEW				 218
-#define ASN1_F_OCSP_RESPBYTES_NEW			 219
-#define ASN1_F_OCSP_RESPDATA_NEW			 220
-#define ASN1_F_OCSP_RESPID_NEW				 221
-#define ASN1_F_OCSP_RESPONSE_NEW			 222
-#define ASN1_F_OCSP_REVOKEDINFO_NEW			 223
-#define ASN1_F_OCSP_SERVICELOC_NEW			 224
-#define ASN1_F_OCSP_SIGNATURE_NEW			 225
-#define ASN1_F_OCSP_SINGLERESP_NEW			 226
-#define ASN1_F_PKCS12_BAGS_NEW				 227
-#define ASN1_F_PKCS12_MAC_DATA_NEW			 228
-#define ASN1_F_PKCS12_NEW				 229
-#define ASN1_F_PKCS12_SAFEBAG_NEW			 230
-#define ASN1_F_PKCS5_PBE2_SET				 173
-#define ASN1_F_PKCS7_DIGEST_NEW				 231
-#define ASN1_F_PKCS7_ENCRYPT_NEW			 232
-#define ASN1_F_PKCS7_ENC_CONTENT_NEW			 233
-#define ASN1_F_PKCS7_ENVELOPE_NEW			 234
-#define ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW		 235
-#define ASN1_F_PKCS7_NEW				 236
-#define ASN1_F_PKCS7_RECIP_INFO_NEW			 237
-#define ASN1_F_PKCS7_SIGNED_NEW				 238
-#define ASN1_F_PKCS7_SIGNER_INFO_NEW			 239
-#define ASN1_F_PKCS7_SIGN_ENVELOPE_NEW			 240
-#define ASN1_F_X509_CINF_NEW				 241
-#define ASN1_F_X509_CRL_ADD0_REVOKED			 174
-#define ASN1_F_X509_INFO_NEW				 175
-#define ASN1_F_X509_NAME_NEW				 176
-#define ASN1_F_X509_NEW					 242
-#define ASN1_F_X509_PKEY_NEW				 177
+#define ASN1_F_D2I_NETSCAPE_RSA				 152
+#define ASN1_F_D2I_NETSCAPE_RSA_2			 153
+#define ASN1_F_D2I_PRIVATEKEY				 154
+#define ASN1_F_D2I_PUBLICKEY				 155
+#define ASN1_F_D2I_X509					 156
+#define ASN1_F_D2I_X509_CINF				 157
+#define ASN1_F_D2I_X509_NAME				 158
+#define ASN1_F_D2I_X509_PKEY				 159
+#define ASN1_F_I2D_ASN1_TIME				 160
+#define ASN1_F_I2D_DSA_PUBKEY				 161
+#define ASN1_F_I2D_NETSCAPE_RSA				 162
+#define ASN1_F_I2D_PRIVATEKEY				 163
+#define ASN1_F_I2D_PUBLICKEY				 164
+#define ASN1_F_I2D_RSA_PUBKEY				 165
+#define ASN1_F_LONG_C2I					 166
+#define ASN1_F_PKCS5_PBE2_SET				 167
+#define ASN1_F_X509_CINF_NEW				 168
+#define ASN1_F_X509_CRL_ADD0_REVOKED			 169
+#define ASN1_F_X509_INFO_NEW				 170
+#define ASN1_F_X509_NAME_NEW				 171
+#define ASN1_F_X509_NEW					 172
+#define ASN1_F_X509_PKEY_NEW				 173
 
 /* Reason codes. */
 #define ASN1_R_AUX_ERROR				 100
 #define ASN1_R_BAD_CLASS				 101
 #define ASN1_R_BAD_OBJECT_HEADER			 102
 #define ASN1_R_BAD_PASSWORD_READ			 103
-#define ASN1_R_BAD_PKCS7_CONTENT			 171
 #define ASN1_R_BAD_TAG					 104
-#define ASN1_R_BAD_TYPE					 172
 #define ASN1_R_BN_LIB					 105
 #define ASN1_R_BOOLEAN_IS_WRONG_LENGTH			 106
 #define ASN1_R_BUFFER_TOO_SMALL				 107
@@ -1080,7 +1005,6 @@ int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
 #define ASN1_R_EXPECTING_AN_INTEGER			 115
 #define ASN1_R_EXPECTING_AN_OBJECT			 116
 #define ASN1_R_EXPECTING_A_BOOLEAN			 117
-#define ASN1_R_EXPECTING_A_NULL				 173
 #define ASN1_R_EXPECTING_A_TIME				 118
 #define ASN1_R_EXPLICIT_LENGTH_MISMATCH			 119
 #define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED		 120
@@ -1109,31 +1033,30 @@ int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
 #define ASN1_R_NO_MATCHING_CHOICE_TYPE			 143
 #define ASN1_R_NULL_IS_WRONG_LENGTH			 144
 #define ASN1_R_ODD_NUMBER_OF_CHARS			 145
-#define ASN1_R_PARSING					 146
-#define ASN1_R_PRIVATE_KEY_HEADER_MISSING		 147
-#define ASN1_R_SECOND_NUMBER_TOO_LARGE			 148
-#define ASN1_R_SEQUENCE_LENGTH_MISMATCH			 149
-#define ASN1_R_SEQUENCE_NOT_CONSTRUCTED			 150
-#define ASN1_R_SHORT_LINE				 151
-#define ASN1_R_STRING_TOO_LONG				 152
-#define ASN1_R_STRING_TOO_SHORT				 153
-#define ASN1_R_TAG_VALUE_TOO_HIGH			 154
-#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 155
-#define ASN1_R_TOO_LONG					 156
-#define ASN1_R_TYPE_NOT_CONSTRUCTED			 157
-#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 158
-#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 159
-#define ASN1_R_UNEXPECTED_EOC				 160
-#define ASN1_R_UNKNOWN_FORMAT				 161
-#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM		 162
-#define ASN1_R_UNKNOWN_OBJECT_TYPE			 163
-#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE			 164
-#define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE		 165
-#define ASN1_R_UNSUPPORTED_CIPHER			 166
-#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM		 167
-#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE		 168
-#define ASN1_R_WRONG_TAG				 169
-#define ASN1_R_WRONG_TYPE				 170
+#define ASN1_R_PRIVATE_KEY_HEADER_MISSING		 146
+#define ASN1_R_SECOND_NUMBER_TOO_LARGE			 147
+#define ASN1_R_SEQUENCE_LENGTH_MISMATCH			 148
+#define ASN1_R_SEQUENCE_NOT_CONSTRUCTED			 149
+#define ASN1_R_SHORT_LINE				 150
+#define ASN1_R_STRING_TOO_LONG				 151
+#define ASN1_R_STRING_TOO_SHORT				 152
+#define ASN1_R_TAG_VALUE_TOO_HIGH			 153
+#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154
+#define ASN1_R_TOO_LONG					 155
+#define ASN1_R_TYPE_NOT_CONSTRUCTED			 156
+#define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 157
+#define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 158
+#define ASN1_R_UNEXPECTED_EOC				 159
+#define ASN1_R_UNKNOWN_FORMAT				 160
+#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM		 161
+#define ASN1_R_UNKNOWN_OBJECT_TYPE			 162
+#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE			 163
+#define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE		 164
+#define ASN1_R_UNSUPPORTED_CIPHER			 165
+#define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM		 166
+#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE		 167
+#define ASN1_R_WRONG_TAG				 168
+#define ASN1_R_WRONG_TYPE				 169
 
 #ifdef  __cplusplus
 }
diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index d0b8edea3a..9587394126 100644
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -108,105 +108,32 @@ static ERR_STRING_DATA ASN1_str_functs[]=
 {ERR_PACK(0,ASN1_F_BN_TO_ASN1_INTEGER,0),	"BN_to_ASN1_INTEGER"},
 {ERR_PACK(0,ASN1_F_COLLECT_DATA,0),	"COLLECT_DATA"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_BIT_STRING,0),	"D2I_ASN1_BIT_STRING"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_BMPSTRING,0),	"D2I_ASN1_BMPSTRING"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_BOOLEAN,0),	"d2i_ASN1_BOOLEAN"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_BYTES,0),	"d2i_ASN1_bytes"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_GENERALIZEDTIME,0),	"D2I_ASN1_GENERALIZEDTIME"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_HEADER,0),	"d2i_ASN1_HEADER"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_INTEGER,0),	"D2I_ASN1_INTEGER"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_NULL,0),	"D2I_ASN1_NULL"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_OBJECT,0),	"d2i_ASN1_OBJECT"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_SET,0),	"d2i_ASN1_SET"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_TYPE_BYTES,0),	"d2i_ASN1_type_bytes"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_UINTEGER,0),	"d2i_ASN1_UINTEGER"},
 {ERR_PACK(0,ASN1_F_D2I_ASN1_UTCTIME,0),	"D2I_ASN1_UTCTIME"},
-{ERR_PACK(0,ASN1_F_D2I_ASN1_VISIBLESTRING,0),	"D2I_ASN1_VISIBLESTRING"},
-{ERR_PACK(0,ASN1_F_D2I_DHPARAMS,0),	"d2i_DHparams"},
-{ERR_PACK(0,ASN1_F_D2I_DSAPARAMS,0),	"d2i_DSAparams"},
-{ERR_PACK(0,ASN1_F_D2I_DSAPRIVATEKEY,0),	"d2i_DSAPrivateKey"},
-{ERR_PACK(0,ASN1_F_D2I_DSAPUBLICKEY,0),	"d2i_DSAPublicKey"},
 {ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA,0),	"d2i_Netscape_RSA"},
 {ERR_PACK(0,ASN1_F_D2I_NETSCAPE_RSA_2,0),	"D2I_NETSCAPE_RSA_2"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_BASICRESP,0),	"D2I_OCSP_BASICRESP"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_CERTID,0),	"D2I_OCSP_CERTID"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_CERTSTATUS,0),	"D2I_OCSP_CERTSTATUS"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_CRLID,0),	"D2I_OCSP_CRLID"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_ONEREQ,0),	"D2I_OCSP_ONEREQ"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_REQINFO,0),	"D2I_OCSP_REQINFO"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_REQUEST,0),	"D2I_OCSP_REQUEST"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPBYTES,0),	"D2I_OCSP_RESPBYTES"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPDATA,0),	"D2I_OCSP_RESPDATA"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPID,0),	"D2I_OCSP_RESPID"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_RESPONSE,0),	"D2I_OCSP_RESPONSE"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_REVOKEDINFO,0),	"D2I_OCSP_REVOKEDINFO"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_SERVICELOC,0),	"D2I_OCSP_SERVICELOC"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_SIGNATURE,0),	"D2I_OCSP_SIGNATURE"},
-{ERR_PACK(0,ASN1_F_D2I_OCSP_SINGLERESP,0),	"D2I_OCSP_SINGLERESP"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS12,0),	"D2I_PKCS12"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS12_BAGS,0),	"D2I_PKCS12_BAGS"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS12_MAC_DATA,0),	"D2I_PKCS12_MAC_DATA"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS12_SAFEBAG,0),	"D2I_PKCS12_SAFEBAG"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7,0),	"D2I_PKCS7"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_DIGEST,0),	"D2I_PKCS7_DIGEST"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_ENCRYPT,0),	"D2I_PKCS7_ENCRYPT"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_ENC_CONTENT,0),	"D2I_PKCS7_ENC_CONTENT"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_ENVELOPE,0),	"D2I_PKCS7_ENVELOPE"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL,0),	"D2I_PKCS7_ISSUER_AND_SERIAL"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_RECIP_INFO,0),	"D2I_PKCS7_RECIP_INFO"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGNED,0),	"D2I_PKCS7_SIGNED"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGNER_INFO,0),	"D2I_PKCS7_SIGNER_INFO"},
-{ERR_PACK(0,ASN1_F_D2I_PKCS7_SIGN_ENVELOPE,0),	"D2I_PKCS7_SIGN_ENVELOPE"},
 {ERR_PACK(0,ASN1_F_D2I_PRIVATEKEY,0),	"d2i_PrivateKey"},
 {ERR_PACK(0,ASN1_F_D2I_PUBLICKEY,0),	"d2i_PublicKey"},
-{ERR_PACK(0,ASN1_F_D2I_RSAPRIVATEKEY,0),	"D2I_RSAPRIVATEKEY"},
-{ERR_PACK(0,ASN1_F_D2I_RSAPUBLICKEY,0),	"D2I_RSAPUBLICKEY"},
 {ERR_PACK(0,ASN1_F_D2I_X509,0),	"D2I_X509"},
 {ERR_PACK(0,ASN1_F_D2I_X509_CINF,0),	"D2I_X509_CINF"},
 {ERR_PACK(0,ASN1_F_D2I_X509_NAME,0),	"D2I_X509_NAME"},
 {ERR_PACK(0,ASN1_F_D2I_X509_PKEY,0),	"d2i_X509_PKEY"},
 {ERR_PACK(0,ASN1_F_I2D_ASN1_TIME,0),	"I2D_ASN1_TIME"},
-{ERR_PACK(0,ASN1_F_I2D_DHPARAMS,0),	"i2d_DHparams"},
-{ERR_PACK(0,ASN1_F_I2D_DSAPARAMS,0),	"i2d_DSAparams"},
-{ERR_PACK(0,ASN1_F_I2D_DSAPRIVATEKEY,0),	"i2d_DSAPrivateKey"},
-{ERR_PACK(0,ASN1_F_I2D_DSAPUBLICKEY,0),	"i2d_DSAPublicKey"},
 {ERR_PACK(0,ASN1_F_I2D_DSA_PUBKEY,0),	"i2d_DSA_PUBKEY"},
 {ERR_PACK(0,ASN1_F_I2D_NETSCAPE_RSA,0),	"i2d_Netscape_RSA"},
 {ERR_PACK(0,ASN1_F_I2D_PRIVATEKEY,0),	"i2d_PrivateKey"},
 {ERR_PACK(0,ASN1_F_I2D_PUBLICKEY,0),	"i2d_PublicKey"},
-{ERR_PACK(0,ASN1_F_I2D_RSAPRIVATEKEY,0),	"I2D_RSAPRIVATEKEY"},
-{ERR_PACK(0,ASN1_F_I2D_RSAPUBLICKEY,0),	"I2D_RSAPUBLICKEY"},
 {ERR_PACK(0,ASN1_F_I2D_RSA_PUBKEY,0),	"i2d_RSA_PUBKEY"},
 {ERR_PACK(0,ASN1_F_LONG_C2I,0),	"LONG_C2I"},
-{ERR_PACK(0,ASN1_F_OCSP_BASICRESP_NEW,0),	"OCSP_BASICRESP_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_CERTID_NEW,0),	"OCSP_CERTID_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_CERTSTATUS_NEW,0),	"OCSP_CERTSTATUS_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_CRLID_NEW,0),	"OCSP_crlID_new"},
-{ERR_PACK(0,ASN1_F_OCSP_ONEREQ_NEW,0),	"OCSP_ONEREQ_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_REQINFO_NEW,0),	"OCSP_REQINFO_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_REQUEST_NEW,0),	"OCSP_REQUEST_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_RESPBYTES_NEW,0),	"OCSP_RESPBYTES_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_RESPDATA_NEW,0),	"OCSP_RESPDATA_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_RESPID_NEW,0),	"OCSP_RESPID_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_RESPONSE_NEW,0),	"OCSP_RESPONSE_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_REVOKEDINFO_NEW,0),	"OCSP_REVOKEDINFO_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_SERVICELOC_NEW,0),	"OCSP_SERVICELOC_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_SIGNATURE_NEW,0),	"OCSP_SIGNATURE_NEW"},
-{ERR_PACK(0,ASN1_F_OCSP_SINGLERESP_NEW,0),	"OCSP_SINGLERESP_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS12_BAGS_NEW,0),	"PKCS12_BAGS_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS12_MAC_DATA_NEW,0),	"PKCS12_MAC_DATA_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS12_NEW,0),	"PKCS12_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS12_SAFEBAG_NEW,0),	"PKCS12_SAFEBAG_NEW"},
 {ERR_PACK(0,ASN1_F_PKCS5_PBE2_SET,0),	"PKCS5_pbe2_set"},
-{ERR_PACK(0,ASN1_F_PKCS7_DIGEST_NEW,0),	"PKCS7_DIGEST_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS7_ENCRYPT_NEW,0),	"PKCS7_ENCRYPT_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS7_ENC_CONTENT_NEW,0),	"PKCS7_ENC_CONTENT_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS7_ENVELOPE_NEW,0),	"PKCS7_ENVELOPE_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW,0),	"PKCS7_ISSUER_AND_SERIAL_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS7_NEW,0),	"PKCS7_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS7_RECIP_INFO_NEW,0),	"PKCS7_RECIP_INFO_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS7_SIGNED_NEW,0),	"PKCS7_SIGNED_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS7_SIGNER_INFO_NEW,0),	"PKCS7_SIGNER_INFO_NEW"},
-{ERR_PACK(0,ASN1_F_PKCS7_SIGN_ENVELOPE_NEW,0),	"PKCS7_SIGN_ENVELOPE_NEW"},
 {ERR_PACK(0,ASN1_F_X509_CINF_NEW,0),	"X509_CINF_NEW"},
 {ERR_PACK(0,ASN1_F_X509_CRL_ADD0_REVOKED,0),	"X509_CRL_add0_revoked"},
 {ERR_PACK(0,ASN1_F_X509_INFO_NEW,0),	"X509_INFO_new"},
@@ -222,9 +149,7 @@ static ERR_STRING_DATA ASN1_str_reasons[]=
 {ASN1_R_BAD_CLASS                        ,"bad class"},
 {ASN1_R_BAD_OBJECT_HEADER                ,"bad object header"},
 {ASN1_R_BAD_PASSWORD_READ                ,"bad password read"},
-{ASN1_R_BAD_PKCS7_CONTENT                ,"bad pkcs7 content"},
 {ASN1_R_BAD_TAG                          ,"bad tag"},
-{ASN1_R_BAD_TYPE                         ,"bad type"},
 {ASN1_R_BN_LIB                           ,"bn lib"},
 {ASN1_R_BOOLEAN_IS_WRONG_LENGTH          ,"boolean is wrong length"},
 {ASN1_R_BUFFER_TOO_SMALL                 ,"buffer too small"},
@@ -238,7 +163,6 @@ static ERR_STRING_DATA ASN1_str_reasons[]=
 {ASN1_R_EXPECTING_AN_INTEGER             ,"expecting an integer"},
 {ASN1_R_EXPECTING_AN_OBJECT              ,"expecting an object"},
 {ASN1_R_EXPECTING_A_BOOLEAN              ,"expecting a boolean"},
-{ASN1_R_EXPECTING_A_NULL                 ,"expecting a null"},
 {ASN1_R_EXPECTING_A_TIME                 ,"expecting a time"},
 {ASN1_R_EXPLICIT_LENGTH_MISMATCH         ,"explicit length mismatch"},
 {ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED     ,"explicit tag not constructed"},
@@ -267,7 +191,6 @@ static ERR_STRING_DATA ASN1_str_reasons[]=
 {ASN1_R_NO_MATCHING_CHOICE_TYPE          ,"no matching choice type"},
 {ASN1_R_NULL_IS_WRONG_LENGTH             ,"null is wrong length"},
 {ASN1_R_ODD_NUMBER_OF_CHARS              ,"odd number of chars"},
-{ASN1_R_PARSING                          ,"parsing"},
 {ASN1_R_PRIVATE_KEY_HEADER_MISSING       ,"private key header missing"},
 {ASN1_R_SECOND_NUMBER_TOO_LARGE          ,"second number too large"},
 {ASN1_R_SEQUENCE_LENGTH_MISMATCH         ,"sequence length mismatch"},