diff options
author | beck <> | 2002-05-15 02:29:21 +0000 |
---|---|---|
committer | beck <> | 2002-05-15 02:29:21 +0000 |
commit | b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9 (patch) | |
tree | fa27cf82a1250b64ed3bf5f4a18c7354d470bbcc /src/lib/libcrypto/pkcs12/pk12err.c | |
parent | e471e1ea98d673597b182ea85f29e30c97cd08b5 (diff) | |
download | openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.gz openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.bz2 openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.zip |
OpenSSL 0.9.7 stable 2002 05 08 merge
Diffstat (limited to 'src/lib/libcrypto/pkcs12/pk12err.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/pk12err.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/pk12err.c b/src/lib/libcrypto/pkcs12/pk12err.c index 12db54f49e..10ab80502c 100644 --- a/src/lib/libcrypto/pkcs12/pk12err.c +++ b/src/lib/libcrypto/pkcs12/pk12err.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #include <openssl/pkcs12.h> | 63 | #include <openssl/pkcs12.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 PKCS12_str_functs[]= | 67 | static ERR_STRING_DATA PKCS12_str_functs[]= |
68 | { | 68 | { |
69 | {ERR_PACK(0,PKCS12_F_PARSE_BAGS,0), "PARSE_BAGS"}, | 69 | {ERR_PACK(0,PKCS12_F_PARSE_BAGS,0), "PARSE_BAGS"}, |
@@ -130,7 +130,7 @@ void ERR_load_PKCS12_strings(void) | |||
130 | if (init) | 130 | if (init) |
131 | { | 131 | { |
132 | init=0; | 132 | init=0; |
133 | #ifndef NO_ERR | 133 | #ifndef OPENSSL_NO_ERR |
134 | ERR_load_strings(ERR_LIB_PKCS12,PKCS12_str_functs); | 134 | ERR_load_strings(ERR_LIB_PKCS12,PKCS12_str_functs); |
135 | ERR_load_strings(ERR_LIB_PKCS12,PKCS12_str_reasons); | 135 | ERR_load_strings(ERR_LIB_PKCS12,PKCS12_str_reasons); |
136 | #endif | 136 | #endif |