Deprecate undocumented SSL_cache_hit(). Deprecate undocumented SSL_cache_hit(). Make SSL_session_reused() into a real function. Reviewed-by: Richard Levitte <levitte@openssl.org>
diff --git a/apps/s_client.c b/apps/s_client.c index d6797f5..39e3e48 100644 --- a/apps/s_client.c +++ b/apps/s_client.c
@@ -2537,7 +2537,7 @@ if (SSL_get_verify_result(s) == X509_V_OK && (peername = SSL_get0_peername(s)) != NULL) BIO_printf(bio, "Verified peername: %s\n", peername); - BIO_printf(bio, (SSL_cache_hit(s) ? "---\nReused, " : "---\nNew, ")); + BIO_printf(bio, (SSL_session_reused(s) ? "---\nReused, " : "---\nNew, ")); c = SSL_get_current_cipher(s); BIO_printf(bio, "%s, Cipher is %s\n", SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
diff --git a/apps/s_server.c b/apps/s_server.c index 45e9227..f07c8f6 100644 --- a/apps/s_server.c +++ b/apps/s_server.c
@@ -2612,7 +2612,7 @@ srtp_profile->name); } #endif - if (SSL_cache_hit(con)) + if (SSL_session_reused(con)) BIO_printf(bio_s_out, "Reused session-id\n"); BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n", SSL_get_secure_renegotiation_support(con) ? "" : " NOT"); @@ -2882,7 +2882,7 @@ #ifndef OPENSSL_NO_EC ssl_print_curves(io, con, 0); #endif - BIO_printf(io, (SSL_cache_hit(con) + BIO_printf(io, (SSL_session_reused(con) ? "---\nReused, " : "---\nNew, ")); c = SSL_get_current_cipher(con); BIO_printf(io, "%s, Cipher is %s\n",