diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-12-12 00:04:44 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-06 11:15:13 +0100 |
| commit | 49b26f54f4c182d6a860c91d01994bdf2bba20de (patch) | |
| tree | 6fe836c46f16d9544ddf96e200ad6a8b7761c76b /apps/s_client.c | |
| parent | 16a9d3746ef7e03207cc3cd290356613556959a5 (diff) | |
Adapt SSL_DEBUG to the new generic trace API
Co-authored-by: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8198)
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 687e755380..7a41d831e9 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -38,6 +38,7 @@ typedef unsigned int u_int; #include <openssl/rand.h> #include <openssl/ocsp.h> #include <openssl/bn.h> +#include <openssl/trace.h> #include <openssl/async.h> #ifndef OPENSSL_NO_SRP # include <openssl/srp.h> @@ -1521,6 +1522,7 @@ int s_client_main(int argc, char **argv) break; } } + if (count4or6 >= 2) { BIO_printf(bio_err, "%s: Can't use both -4 and -6\n", prog); goto opthelp; @@ -3321,8 +3323,7 @@ static void print_stuff(BIO *bio, SSL *s, int full) BIO_printf(bio_err, "Using Kernel TLS for sending\n"); #endif -#ifdef SSL_DEBUG - { + if (OSSL_TRACE_ENABLED(TLS)) { /* Print out local port of connection: useful for debugging */ int sock; union BIO_sock_info_u info; @@ -3335,7 +3336,6 @@ static void print_stuff(BIO *bio, SSL *s, int full) } BIO_ADDR_free(info.addr); } -#endif #if !defined(OPENSSL_NO_NEXTPROTONEG) if (next_proto.status != -1) { |