diff options
Diffstat (limited to 'src/lib/libcrypto/dh/dh_err.c')
-rw-r--r-- | src/lib/libcrypto/dh/dh_err.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c index ff2d1684c2..d837950aec 100644 --- a/src/lib/libcrypto/dh/dh_err.c +++ b/src/lib/libcrypto/dh/dh_err.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* crypto/dh/dh_err.c */ | 1 | /* crypto/dh/dh_err.c */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2002 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions | 6 | * modification, are permitted provided that the following conditions |
@@ -63,7 +63,7 @@ | |||
63 | #include <openssl/dh.h> | 63 | #include <openssl/dh.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 DH_str_functs[]= | 67 | static ERR_STRING_DATA DH_str_functs[]= |
68 | { | 68 | { |
69 | {ERR_PACK(0,DH_F_DHPARAMS_PRINT,0), "DHparams_print"}, | 69 | {ERR_PACK(0,DH_F_DHPARAMS_PRINT,0), "DHparams_print"}, |
@@ -71,12 +71,13 @@ static ERR_STRING_DATA DH_str_functs[]= | |||
71 | {ERR_PACK(0,DH_F_DH_COMPUTE_KEY,0), "DH_compute_key"}, | 71 | {ERR_PACK(0,DH_F_DH_COMPUTE_KEY,0), "DH_compute_key"}, |
72 | {ERR_PACK(0,DH_F_DH_GENERATE_KEY,0), "DH_generate_key"}, | 72 | {ERR_PACK(0,DH_F_DH_GENERATE_KEY,0), "DH_generate_key"}, |
73 | {ERR_PACK(0,DH_F_DH_GENERATE_PARAMETERS,0), "DH_generate_parameters"}, | 73 | {ERR_PACK(0,DH_F_DH_GENERATE_PARAMETERS,0), "DH_generate_parameters"}, |
74 | {ERR_PACK(0,DH_F_DH_NEW,0), "DH_new"}, | 74 | {ERR_PACK(0,DH_F_DH_NEW_METHOD,0), "DH_new_method"}, |
75 | {0,NULL} | 75 | {0,NULL} |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static ERR_STRING_DATA DH_str_reasons[]= | 78 | static ERR_STRING_DATA DH_str_reasons[]= |
79 | { | 79 | { |
80 | {DH_R_BAD_GENERATOR ,"bad generator"}, | ||
80 | {DH_R_NO_PRIVATE_VALUE ,"no private value"}, | 81 | {DH_R_NO_PRIVATE_VALUE ,"no private value"}, |
81 | {0,NULL} | 82 | {0,NULL} |
82 | }; | 83 | }; |
@@ -90,7 +91,7 @@ void ERR_load_DH_strings(void) | |||
90 | if (init) | 91 | if (init) |
91 | { | 92 | { |
92 | init=0; | 93 | init=0; |
93 | #ifndef NO_ERR | 94 | #ifndef OPENSSL_NO_ERR |
94 | ERR_load_strings(ERR_LIB_DH,DH_str_functs); | 95 | ERR_load_strings(ERR_LIB_DH,DH_str_functs); |
95 | ERR_load_strings(ERR_LIB_DH,DH_str_reasons); | 96 | ERR_load_strings(ERR_LIB_DH,DH_str_reasons); |
96 | #endif | 97 | #endif |