diff options
author | Brian Smith <brian@briansmith.org> | 2015-04-10 05:21:10 +0300 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-04-13 23:23:29 +0300 |
commit | 83a82981dc81b4699f6d7aa423e32712af71a55a (patch) | |
tree | fcbbae35a2812510bbd259779a51216fc7a43f63 /tool/pkcs12.cc | |
parent | 7d897a1bf2abab32f3e6200ee15930d68ae87ad6 (diff) |
Rename BIO_print_errors_fp back to ERR_print_errors_fp & refactor it.
A previous change in BoringSSL renamed ERR_print_errors_fp to
BIO_print_errors_fp as part of refactoring the code to improve the
layering of modules within BoringSSL. Rename it back for better
compatibility with code that was using the function under the original
name. Move its definition back to crypto/err using an implementation
that avoids depending on crypto/bio.
Change-Id: Iee7703bb1eb4a3d640aff6485712bea71d7c1052
Reviewed-on: https://boringssl-review.googlesource.com/4310
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'tool/pkcs12.cc')
-rw-r--r-- | tool/pkcs12.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tool/pkcs12.cc b/tool/pkcs12.cc index 7ce2bd02..c191531f 100644 --- a/tool/pkcs12.cc +++ b/tool/pkcs12.cc @@ -31,6 +31,7 @@ #endif #include <openssl/bytestring.h> +#include <openssl/err.h> #include <openssl/pem.h> #include <openssl/pkcs8.h> #include <openssl/stack.h> @@ -123,7 +124,7 @@ bool DoPKCS12(const std::vector<std::string> &args) { if (!PKCS12_get_key_and_certs(&key, certs, &pkcs12, password)) { fprintf(stderr, "Failed to parse PKCS#12 data:\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); return false; } |