Revert previous; the implementation is incorrect since it assumes that the

provided error code matches the error that is currently on the top of the
error stack.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/libcrypto/err/err_prn.c b/src/lib/libcrypto/err/err_prn.c
index 6a3062a89a..48166829d4 100644
--- a/src/lib/libcrypto/err/err_prn.c
+++ b/src/lib/libcrypto/err/err_prn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err_prn.c,v 1.17 2017/02/07 03:11:11 beck Exp $ */
+/* $OpenBSD: err_prn.c,v 1.18 2017/02/07 15:52:33 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -80,8 +80,8 @@ ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), void *u)
         while ((l = ERR_get_error_line_data(&file, &line, &data,
             &flags)) != 0) {
                 ERR_error_string_n(l, buf, sizeof buf);
-                (void) snprintf(buf2, sizeof(buf2), "%lu:%s:%s\n", es,
-                    buf, (flags & ERR_TXT_STRING) ? data : "");
+                (void) snprintf(buf2, sizeof(buf2), "%lu:%s:%s:%d:%s\n", es,
+                    buf, file, line, (flags & ERR_TXT_STRING) ? data : "");
                 if (cb(buf2, strlen(buf2), u) <= 0)
                         break; /* abort outputting the error report */
         }