diff options
| author | Adam Langley <agl@google.com> | 2015-09-24 10:57:52 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-09-24 11:04:03 -0700 |
| commit | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/ssl/ssl_txt.c | |
| parent | 08656b61d075740bfb24ddcce65223146259fc02 (diff) | |
| download | external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.zip external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.gz external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.bz2 | |
external/boringssl: sync with upstream.
This change imports the current version of BoringSSL. The only local
change now is that |BORINGSSL_201509| is defined in base.h. This allows
this change to be made without (hopefully) breaking the build.
This change will need https://android-review.googlesource.com/172744 to
be landed afterwards to update a test.
Change-Id: I6d1f463f7785a2423bd846305af91c973c326104
Diffstat (limited to 'src/ssl/ssl_txt.c')
| -rw-r--r-- | src/ssl/ssl_txt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ssl/ssl_txt.c b/src/ssl/ssl_txt.c index 2275f16..3ba0887 100644 --- a/src/ssl/ssl_txt.c +++ b/src/ssl/ssl_txt.c @@ -80,12 +80,14 @@ * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR * OTHERWISE. */ +#include <openssl/ssl.h> + #include <inttypes.h> #include <stdio.h> -#include <openssl/buf.h> +#include <openssl/bio.h> #include <openssl/err.h> -#include <openssl/mem.h> +#include <openssl/x509.h> #include "internal.h" @@ -96,7 +98,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, SSL_SESSION_print_fp, ERR_R_BUF_LIB); + OPENSSL_PUT_ERROR(SSL, ERR_R_BUF_LIB); return 0; } |