summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-02-08 16:18:26 +0000
committerDr. Stephen Henson <steve@openssl.org>2016-02-08 16:57:07 +0000
commitb577fd0b81562ab97cf992bfffbdaf531e0d1d8c (patch)
tree6d91334ace2664132c2babfbf85edb1219457e15 /apps
parent43ecb9c35caed8623cfd83e7d893b8b67725feb7 (diff)
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>
Diffstat (limited to 'apps')
-rw-r--r--apps/s_client.c2
-rw-r--r--apps/s_server.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index d6797f5066..39e3e48288 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2537,7 +2537,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
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 45e9227f07..f07c8f61a9 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2612,7 +2612,7 @@ static int init_ssl_connection(SSL *con)
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 @@ static int www_body(const char *hostname, int s, int stype,
#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",