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 /include/openssl/bio.h | |
| 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 'include/openssl/bio.h')
| -rw-r--r-- | include/openssl/bio.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/openssl/bio.h b/include/openssl/bio.h index 349a073f..0a637e45 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -62,6 +62,7 @@ #include <stdarg.h> #include <stdio.h> /* For FILE */ +#include <openssl/err.h> /* for ERR_print_errors_fp */ #include <openssl/ex_data.h> #include <openssl/stack.h> @@ -331,10 +332,6 @@ OPENSSL_EXPORT int BIO_indent(BIO *bio, unsigned indent, unsigned max_indent); OPENSSL_EXPORT int BIO_hexdump(BIO *bio, const uint8_t *data, size_t len, unsigned indent); -/* BIO_print_errors_fp prints the current contents of the error stack to |out| - * using human readable strings where possible. */ -OPENSSL_EXPORT void BIO_print_errors_fp(FILE *out); - /* BIO_print_errors prints the current contents of the error stack to |bio| * using human readable strings where possible. */ OPENSSL_EXPORT void BIO_print_errors(BIO *bio); @@ -706,6 +703,14 @@ OPENSSL_EXPORT int BIO_zero_copy_get_write_buf_done(BIO* bio, #define BIO_CTRL_SET_FILENAME 30 /* BIO_s_file special */ +/* Android compatibility section. + * + * A previous version of BoringSSL used in Android renamed ERR_print_errors_fp + * to BIO_print_errors_fp. It has subsequently been renamed back to + * ERR_print_errors_fp. */ +#define BIO_print_errors_fp ERR_print_errors_fp + + /* Private functions */ #define BIO_FLAGS_READ 0x01 |