Fix d4a4370050f7d72239b92a60ab9d4a2dd5e9fd84
authorDr Stephen Henson <shenson@drh-consultancy.co.uk>
Mon, 11 Aug 2014 21:32:57 +0000 (17:32 -0400)
committerRich Salz <rsalz@akamai.com>
Mon, 11 Aug 2014 21:32:57 +0000 (17:32 -0400)
Fully remove old error, per drH
Reviewed-by: rsalz
crypto/asn1/asn1.h
crypto/asn1/asn1_gen.c

index 51bd621..d6342d0 100644 (file)
@@ -1165,10 +1165,6 @@ ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
 int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
 int SMIME_text(BIO *in, BIO *out);
 
-/* Older versions had the following typo'd name, so for a while, anyway,
- * we provide the old broken name as well. */
-#define ASN1_R_UNKOWN_FORMAT ASN1_R_UNKNOWN_FORMAT
-
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -1415,7 +1411,6 @@ void ERR_load_ASN1_strings(void);
 #define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                  163
 #define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM              199
 #define ASN1_R_UNKNOWN_TAG                              194
-#define ASN1_R_UNKOWN_FORMAT                            195
 #define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE          164
 #define ASN1_R_UNSUPPORTED_CIPHER                       165
 #define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM                 166
index 7c2c337..25b270d 100644 (file)
@@ -372,7 +372,7 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
                        arg->format = ASN1_GEN_FORMAT_BITLIST;
                else
                        {
-                       ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKOWN_FORMAT);
+                       ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
                        return -1;
                        }
                break;