diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 00:26:37 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-25 00:26:37 +0000 |
| commit | a04d78d392463df4e69a64360c952ffa5abd22f7 (patch) | |
| tree | dc62c249d595198e0d99e43890019d21e901fbec /src/ssl/ssl_txt.c | |
| parent | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff) | |
| download | external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.zip external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.gz external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.bz2 | |
Revert "external/boringssl: sync with upstream."
This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3.
This breaks some x86 builds.
Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25
Diffstat (limited to 'src/ssl/ssl_txt.c')
| -rw-r--r-- | src/ssl/ssl_txt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ssl/ssl_txt.c b/src/ssl/ssl_txt.c index 3ba0887..2275f16 100644 --- a/src/ssl/ssl_txt.c +++ b/src/ssl/ssl_txt.c @@ -80,14 +80,12 @@ * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR * OTHERWISE. */ -#include <openssl/ssl.h> - #include <inttypes.h> #include <stdio.h> -#include <openssl/bio.h> +#include <openssl/buf.h> #include <openssl/err.h> -#include <openssl/x509.h> +#include <openssl/mem.h> #include "internal.h" @@ -98,7 +96,7 @@ int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x) { b = BIO_new(BIO_s_file()); if (b == NULL) { - OPENSSL_PUT_ERROR(SSL, ERR_R_BUF_LIB); + OPENSSL_PUT_ERROR(SSL, SSL_SESSION_print_fp, ERR_R_BUF_LIB); return 0; } |