diff options
author | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
---|---|---|
committer | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
commit | 426a154a830ca2d9bae74612741ff86332f5c66e (patch) | |
tree | 7937e26cb4336f7a8bfd41a8238859a89e83e4b3 /lib/libcrypto/err | |
parent | 1ab62f029308adf86f7a805afd722d5170be8c34 (diff) |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/err')
-rw-r--r-- | lib/libcrypto/err/err.c | 13 | ||||
-rw-r--r-- | lib/libcrypto/err/err.h | 3 | ||||
-rw-r--r-- | lib/libcrypto/err/err_all.c | 7 |
3 files changed, 17 insertions, 6 deletions
diff --git a/lib/libcrypto/err/err.c b/lib/libcrypto/err/err.c index 69713a6e2ff..fcdb244008f 100644 --- a/lib/libcrypto/err/err.c +++ b/lib/libcrypto/err/err.c @@ -1066,6 +1066,13 @@ void ERR_set_error_data(char *data, int flags) void ERR_add_error_data(int num, ...) { va_list args; + va_start(args, num); + ERR_add_error_vdata(num, args); + va_end(args); + } + +void ERR_add_error_vdata(int num, va_list args) + { int i,n,s; char *str,*p,*a; @@ -1074,7 +1081,6 @@ void ERR_add_error_data(int num, ...) if (str == NULL) return; str[0]='\0'; - va_start(args, num); n=0; for (i=0; i<num; i++) { @@ -1090,7 +1096,7 @@ void ERR_add_error_data(int num, ...) if (p == NULL) { OPENSSL_free(str); - goto err; + return; } else str=p; @@ -1099,9 +1105,6 @@ void ERR_add_error_data(int num, ...) } } ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING); - -err: - va_end(args); } int ERR_set_mark(void) diff --git a/lib/libcrypto/err/err.h b/lib/libcrypto/err/err.h index b9f8c16d47d..974cc9cc6f9 100644 --- a/lib/libcrypto/err/err.h +++ b/lib/libcrypto/err/err.h @@ -344,8 +344,9 @@ void ERR_print_errors_fp(FILE *fp); #endif #ifndef OPENSSL_NO_BIO void ERR_print_errors(BIO *bp); -void ERR_add_error_data(int num, ...); #endif +void ERR_add_error_data(int num, ...); +void ERR_add_error_vdata(int num, va_list args); void ERR_load_strings(int lib,ERR_STRING_DATA str[]); void ERR_unload_strings(int lib,ERR_STRING_DATA str[]); void ERR_load_ERR_strings(void); diff --git a/lib/libcrypto/err/err_all.c b/lib/libcrypto/err/err_all.c index fc049e8e88b..bd8946d8ba0 100644 --- a/lib/libcrypto/err/err_all.c +++ b/lib/libcrypto/err/err_all.c @@ -104,6 +104,10 @@ #endif #include <openssl/comp.h> +#ifdef OPENSSL_FIPS +#include <openssl/fips.h> +#endif + void ERR_load_crypto_strings(void) { #ifndef OPENSSL_NO_ERR @@ -157,4 +161,7 @@ void ERR_load_crypto_strings(void) #endif ERR_load_COMP_strings(); #endif +#ifdef OPENSSL_FIPS + ERR_load_FIPS_strings(); +#endif } |