diff options
author | Rob Percival <robpercival@google.com> | 2016-03-10 18:17:23 +0000 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-03-10 14:53:04 -0500 |
commit | 8359b57f27bbc320c3c08035917d829b303ea850 (patch) | |
tree | 0a63789a4ffb5b5562a5d5716d9dd502f877eff7 /apps | |
parent | f0667b1430bac3b8c9c5b76985ad24cf9b13a0a9 (diff) |
check reviewer --reviewer=emilia
Remove 'log' field from SCT and related accessors
In order to still have access to an SCT's CTLOG when calling SCT_print,
SSL_CTX_get0_ctlog_store has been added.
Improved documentation for some CT functions in openssl/ssl.h.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/s_client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 38d7c32a02..eb0cc337ed 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -204,7 +204,7 @@ static int c_quiet = 0; static int c_ign_eof = 0; static int c_brief = 0; -static void print_stuff(BIO *berr, SSL *con, int full); +static void print_stuff(BIO *berr, const SSL_CTX *ctx, SSL *con, int full); static int ocsp_resp_cb(SSL *s, void *arg); static int saved_errno; @@ -2184,7 +2184,7 @@ int s_client_main(int argc, char **argv) print_ssl_summary(con); } - print_stuff(bio_c_out, con, full_log); + print_stuff(bio_c_out, ctx, con, full_log); if (full_log > 0) full_log--; @@ -2516,13 +2516,13 @@ int s_client_main(int argc, char **argv) ret = 0; shut: if (in_init) - print_stuff(bio_c_out, con, full_log); + print_stuff(bio_c_out, ctx, con, full_log); do_ssl_shutdown(con); BIO_closesocket(SSL_get_fd(con)); end: if (con != NULL) { if (prexit != 0) - print_stuff(bio_c_out, con, 1); + print_stuff(bio_c_out, ctx, con, 1); SSL_free(con); } #if !defined(OPENSSL_NO_NEXTPROTONEG) @@ -2554,7 +2554,7 @@ int s_client_main(int argc, char **argv) return (ret); } -static void print_stuff(BIO *bio, SSL *s, int full) +static void print_stuff(BIO *bio, const SSL_CTX *ctx, SSL *s, int full) { X509 *peer = NULL; char buf[BUFSIZ]; @@ -2634,7 +2634,7 @@ static void print_stuff(BIO *bio, SSL *s, int full) if (scts != NULL && sk_SCT_num(scts) > 0) { BIO_printf(bio, "---\n"); - SCT_LIST_print(scts, bio, 0, "\n---\n"); + SCT_LIST_print(scts, bio, 0, "\n---\n", SSL_CTX_get0_ctlog_store(ctx)); BIO_printf(bio, "\n"); } #endif |