diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pkcs7err.c')
-rw-r--r-- | src/lib/libcrypto/pkcs7/pkcs7err.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs7/pkcs7err.c b/src/lib/libcrypto/pkcs7/pkcs7err.c index 8ded8913db..5e51527a40 100644 --- a/src/lib/libcrypto/pkcs7/pkcs7err.c +++ b/src/lib/libcrypto/pkcs7/pkcs7err.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #include <openssl/pkcs7.h> | 63 | #include <openssl/pkcs7.h> |
64 | 64 | ||
65 | /* BEGIN ERROR CODES */ | 65 | /* BEGIN ERROR CODES */ |
66 | #ifndef NO_ERR | 66 | #ifndef OPENSSL_NO_ERR |
67 | static ERR_STRING_DATA PKCS7_str_functs[]= | 67 | static ERR_STRING_DATA PKCS7_str_functs[]= |
68 | { | 68 | { |
69 | {ERR_PACK(0,PKCS7_F_B64_READ_PKCS7,0), "B64_READ_PKCS7"}, | 69 | {ERR_PACK(0,PKCS7_F_B64_READ_PKCS7,0), "B64_READ_PKCS7"}, |
@@ -105,7 +105,6 @@ static ERR_STRING_DATA PKCS7_str_reasons[]= | |||
105 | {PKCS7_R_DIGEST_FAILURE ,"digest failure"}, | 105 | {PKCS7_R_DIGEST_FAILURE ,"digest failure"}, |
106 | {PKCS7_R_ERROR_ADDING_RECIPIENT ,"error adding recipient"}, | 106 | {PKCS7_R_ERROR_ADDING_RECIPIENT ,"error adding recipient"}, |
107 | {PKCS7_R_ERROR_SETTING_CIPHER ,"error setting cipher"}, | 107 | {PKCS7_R_ERROR_SETTING_CIPHER ,"error setting cipher"}, |
108 | {PKCS7_R_INTERNAL_ERROR ,"internal error"}, | ||
109 | {PKCS7_R_INVALID_MIME_TYPE ,"invalid mime type"}, | 108 | {PKCS7_R_INVALID_MIME_TYPE ,"invalid mime type"}, |
110 | {PKCS7_R_INVALID_NULL_POINTER ,"invalid null pointer"}, | 109 | {PKCS7_R_INVALID_NULL_POINTER ,"invalid null pointer"}, |
111 | {PKCS7_R_MIME_NO_CONTENT_TYPE ,"mime no content type"}, | 110 | {PKCS7_R_MIME_NO_CONTENT_TYPE ,"mime no content type"}, |
@@ -152,7 +151,7 @@ void ERR_load_PKCS7_strings(void) | |||
152 | if (init) | 151 | if (init) |
153 | { | 152 | { |
154 | init=0; | 153 | init=0; |
155 | #ifndef NO_ERR | 154 | #ifndef OPENSSL_NO_ERR |
156 | ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_functs); | 155 | ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_functs); |
157 | ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_reasons); | 156 | ERR_load_strings(ERR_LIB_PKCS7,PKCS7_str_reasons); |
158 | #endif | 157 | #endif |