summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguenther <>2014-04-20 17:01:35 +0000
committerguenther <>2014-04-20 17:01:35 +0000
commit1d65619634628a172cd4636fa066da11babfa307 (patch)
treecbc96169fb57db579e3c9a5fe1612b24b6c0f8e7
parent9ac91f6b64d9ad9f95056ff3e49b351c73df88ce (diff)
downloadopenbsd-1d65619634628a172cd4636fa066da11babfa307.tar.gz
openbsd-1d65619634628a172cd4636fa066da11babfa307.tar.bz2
openbsd-1d65619634628a172cd4636fa066da11babfa307.zip
Restore beck's rev 1.9: snprintf() was reviewed
-rw-r--r--src/lib/libcrypto/err/err_prn.c2
-rw-r--r--src/lib/libssl/src/crypto/err/err_prn.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c
index be4d5de2d2..7374c0abe7 100644
--- a/src/lib/libcrypto/err/err_prn.c
+++ b/src/lib/libcrypto/err/err_prn.c
@@ -79,7 +79,7 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
79 while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0) 79 while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0)
80 { 80 {
81 ERR_error_string_n(l, buf, sizeof buf); 81 ERR_error_string_n(l, buf, sizeof buf);
82 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, buf,
83 file, line, (flags & ERR_TXT_STRING) ? data : ""); 83 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 */
diff --git a/src/lib/libssl/src/crypto/err/err_prn.c b/src/lib/libssl/src/crypto/err/err_prn.c
index be4d5de2d2..7374c0abe7 100644
--- a/src/lib/libssl/src/crypto/err/err_prn.c
+++ b/src/lib/libssl/src/crypto/err/err_prn.c
@@ -79,7 +79,7 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
79 while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0) 79 while ((l=ERR_get_error_line_data(&file,&line,&data,&flags)) != 0)
80 { 80 {
81 ERR_error_string_n(l, buf, sizeof buf); 81 ERR_error_string_n(l, buf, sizeof buf);
82 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, buf,
83 file, line, (flags & ERR_TXT_STRING) ? data : ""); 83 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 */