diff options
| author | Rob Percival <robpercival@google.com> | 2016-03-10 19:49:34 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-10 14:53:04 -0500 |
| commit | 0d4d5ab81980888e06b457fb00a1b224e921976f (patch) | |
| tree | bc4ca801ec32ebd1ce4f896209c7f72e9b1ae6aa | |
| parent | 49e5db0b313c36c59a943750d9192310ad7f5cf8 (diff) | |
check reviewer --reviewer=emilia
Use SSL_get_SSL_CTX instead of passing SSL_CTX to s_client.c:print_stuff
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | apps/s_client.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index eb0cc337ed..9c3e6aedd5 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, const SSL_CTX *ctx, SSL *con, int full); +static void print_stuff(BIO *berr, 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, ctx, con, full_log); + print_stuff(bio_c_out, 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, ctx, con, full_log); + print_stuff(bio_c_out, 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, ctx, con, 1); + print_stuff(bio_c_out, 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, const SSL_CTX *ctx, SSL *s, int full) +static void print_stuff(BIO *bio, SSL *s, int full) { X509 *peer = NULL; char buf[BUFSIZ]; @@ -2570,6 +2570,7 @@ static void print_stuff(BIO *bio, const SSL_CTX *ctx, SSL *s, int full) #ifndef OPENSSL_NO_CT const STACK_OF(SCT) *scts; #endif + const SSL_CTX *ctx = SSL_get_SSL_CTX(s); if (full) { int got_a_chain = 0; @@ -2633,8 +2634,10 @@ static void print_stuff(BIO *bio, const SSL_CTX *ctx, SSL *s, int full) } if (scts != NULL && sk_SCT_num(scts) > 0) { + const CTLOG_STORE *log_store = SSL_CTX_get0_ctlog_store(ctx); + BIO_printf(bio, "---\n"); - SCT_LIST_print(scts, bio, 0, "\n---\n", SSL_CTX_get0_ctlog_store(ctx)); + SCT_LIST_print(scts, bio, 0, "\n---\n", log_store); BIO_printf(bio, "\n"); } #endif |