diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/err/err_prn.c | 70 |
1 files changed, 37 insertions, 33 deletions
diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c index 7374c0abe7..d6b488fee9 100644 --- a/src/lib/libcrypto/err/err_prn.c +++ b/src/lib/libcrypto/err/err_prn.c | |||
@@ -5,21 +5,21 @@ | |||
5 | * This package is an SSL implementation written | 5 | * This package is an SSL implementation written |
6 | * by Eric Young (eay@cryptsoft.com). | 6 | * by Eric Young (eay@cryptsoft.com). |
7 | * The implementation was written so as to conform with Netscapes SSL. | 7 | * The implementation was written so as to conform with Netscapes SSL. |
8 | * | 8 | * |
9 | * This library is free for commercial and non-commercial use as long as | 9 | * This library is free for commercial and non-commercial use as long as |
10 | * the following conditions are aheared to. The following conditions | 10 | * the following conditions are aheared to. The following conditions |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | 11 | * apply to all code found in this distribution, be it the RC4, RSA, |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation |
13 | * included with this distribution is covered by the same copyright terms | 13 | * included with this distribution is covered by the same copyright terms |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). |
15 | * | 15 | * |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | 16 | * Copyright remains Eric Young's, and as such any Copyright notices in |
17 | * the code are not to be removed. | 17 | * the code are not to be removed. |
18 | * If this package is used in a product, Eric Young should be given attribution | 18 | * If this package is used in a product, Eric Young should be given attribution |
19 | * as the author of the parts of the library used. | 19 | * as the author of the parts of the library used. |
20 | * This can be in the form of a textual message at program startup or | 20 | * This can be in the form of a textual message at program startup or |
21 | * in documentation (online or textual) provided with the package. | 21 | * in documentation (online or textual) provided with the package. |
22 | * | 22 | * |
23 | * Redistribution and use in source and binary forms, with or without | 23 | * Redistribution and use in source and binary forms, with or without |
24 | * modification, are permitted provided that the following conditions | 24 | * modification, are permitted provided that the following conditions |
25 | * are met: | 25 | * are met: |
@@ -34,10 +34,10 @@ | |||
34 | * Eric Young (eay@cryptsoft.com)" | 34 | * Eric Young (eay@cryptsoft.com)" |
35 | * The word 'cryptographic' can be left out if the rouines from the library | 35 | * The word 'cryptographic' can be left out if the rouines from the library |
36 | * being used are not cryptographic related :-). | 36 | * being used are not cryptographic related :-). |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | 37 | * 4. If you include any Windows specific code (or a derivative thereof) from |
38 | * the apps directory (application code) you must include an acknowledgement: | 38 | * the apps directory (application code) you must include an acknowledgement: |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" |
40 | * | 40 | * |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
@@ -49,7 +49,7 @@ | |||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
51 | * SUCH DAMAGE. | 51 | * SUCH DAMAGE. |
52 | * | 52 | * |
53 | * The licence and distribution terms for any publically available version or | 53 | * The licence and distribution terms for any publically available version or |
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be |
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
@@ -63,52 +63,56 @@ | |||
63 | #include <openssl/buffer.h> | 63 | #include <openssl/buffer.h> |
64 | #include <openssl/err.h> | 64 | #include <openssl/err.h> |
65 | 65 | ||
66 | void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), | 66 | void |
67 | void *u) | 67 | ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), void *u) |
68 | { | 68 | { |
69 | unsigned long l; | 69 | unsigned long l; |
70 | char buf[256]; | 70 | char buf[256]; |
71 | char buf2[4096]; | 71 | char buf2[4096]; |
72 | const char *file,*data; | 72 | const char *file, *data; |
73 | int line,flags; | 73 | int line, flags; |
74 | unsigned long es; | 74 | unsigned long es; |
75 | CRYPTO_THREADID cur; | 75 | CRYPTO_THREADID cur; |
76 | 76 | ||
77 | CRYPTO_THREADID_current(&cur); | 77 | CRYPTO_THREADID_current(&cur); |
78 | es=CRYPTO_THREADID_hash(&cur); | 78 | es = CRYPTO_THREADID_hash(&cur); |
79 | while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0) | 79 | while ((l = ERR_get_error_line_data(&file, &line, &data, |
80 | { | 80 | &flags)) != 0) { |
81 | ERR_error_string_n(l, buf, sizeof buf); | 81 | ERR_error_string_n(l, buf, sizeof buf); |
82 | (void) snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es, buf, | 82 | (void) snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es, |
83 | file, line, (flags & ERR_TXT_STRING) ? data : ""); | 83 | buf, file, line, (flags & ERR_TXT_STRING) ? data : ""); |
84 | if (cb(buf2, strlen(buf2), u) <= 0) | 84 | if (cb(buf2, strlen(buf2), u) <= 0) |
85 | break; /* abort outputting the error report */ | 85 | break; /* abort outputting the error report */ |
86 | } | ||
87 | } | 86 | } |
87 | } | ||
88 | 88 | ||
89 | #ifndef OPENSSL_NO_FP_API | 89 | #ifndef OPENSSL_NO_FP_API |
90 | static int print_fp(const char *str, size_t len, void *fp) | 90 | static int |
91 | { | 91 | print_fp(const char *str, size_t len, void *fp) |
92 | { | ||
92 | BIO bio; | 93 | BIO bio; |
93 | 94 | ||
94 | BIO_set(&bio,BIO_s_file()); | 95 | BIO_set(&bio, BIO_s_file()); |
95 | BIO_set_fp(&bio,fp,BIO_NOCLOSE); | 96 | BIO_set_fp(&bio, fp, BIO_NOCLOSE); |
96 | 97 | ||
97 | return BIO_printf(&bio, "%s", str); | 98 | return BIO_printf(&bio, "%s", str); |
98 | } | 99 | } |
99 | void ERR_print_errors_fp(FILE *fp) | 100 | |
100 | { | 101 | void |
102 | ERR_print_errors_fp(FILE *fp) | ||
103 | { | ||
101 | ERR_print_errors_cb(print_fp, fp); | 104 | ERR_print_errors_cb(print_fp, fp); |
102 | } | 105 | } |
103 | #endif | 106 | #endif |
104 | 107 | ||
105 | static int print_bio(const char *str, size_t len, void *bp) | 108 | static int |
106 | { | 109 | print_bio(const char *str, size_t len, void *bp) |
110 | { | ||
107 | return BIO_write((BIO *)bp, str, len); | 111 | return BIO_write((BIO *)bp, str, len); |
108 | } | 112 | } |
109 | void ERR_print_errors(BIO *bp) | ||
110 | { | ||
111 | ERR_print_errors_cb(print_bio, bp); | ||
112 | } | ||
113 | 113 | ||
114 | 114 | void | |
115 | ERR_print_errors(BIO *bp) | ||
116 | { | ||
117 | ERR_print_errors_cb(print_bio, bp); | ||
118 | } | ||