mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate undocumented SSL_cache_hit().

Browse Source 
Deprecate undocumented SSL_cache_hit(). Make SSL_session_reused() into a
real function.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-02-08 16:18:26 +00:00
parent 43ecb9c35c
commit b577fd0b81
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/s_client.c
View File

@ -2537,7 +2537,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
if (SSL_get_verify_result(s) == X509_V_OK && if (SSL_get_verify_result(s) == X509_V_OK &&
(peername = SSL_get0_peername(s)) != NULL) (peername = SSL_get0_peername(s)) != NULL)
BIO_printf(bio, "Verified peername: %s\n", peername); 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); c = SSL_get_current_cipher(s);
BIO_printf(bio, "%s, Cipher is %s\n", BIO_printf(bio, "%s, Cipher is %s\n",
SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c)); SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));

4
apps/s_server.c
View File

@ -2612,7 +2612,7 @@ static int init_ssl_connection(SSL *con)
srtp_profile->name); srtp_profile->name);
} }
#endif #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, "Reused session-id\n");
BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n", BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n",
SSL_get_secure_renegotiation_support(con) ? "" : " NOT"); 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 #ifndef OPENSSL_NO_EC
ssl_print_curves(io, con, 0); ssl_print_curves(io, con, 0);
#endif #endif
BIO_printf(io, (SSL_cache_hit(con) BIO_printf(io, (SSL_session_reused(con)
? "---\nReused, " : "---\nNew, ")); ? "---\nReused, " : "---\nNew, "));
c = SSL_get_current_cipher(con); c = SSL_get_current_cipher(con);
BIO_printf(io, "%s, Cipher is %s\n", BIO_printf(io, "%s, Cipher is %s\n",

8
include/openssl/ssl.h
View File

@ -1115,7 +1115,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
# define SSL_CTRL_SET_TMP_DH 3 # define SSL_CTRL_SET_TMP_DH 3
# define SSL_CTRL_SET_TMP_ECDH 4 # define SSL_CTRL_SET_TMP_ECDH 4
# define SSL_CTRL_SET_TMP_DH_CB 6 # define SSL_CTRL_SET_TMP_DH_CB 6
# define SSL_CTRL_GET_SESSION_REUSED 8
# define SSL_CTRL_GET_CLIENT_CERT_REQUEST 9 # define SSL_CTRL_GET_CLIENT_CERT_REQUEST 9
# define SSL_CTRL_GET_NUM_RENEGOTIATIONS 10 # define SSL_CTRL_GET_NUM_RENEGOTIATIONS 10
# define SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS 11 # define SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS 11
@ -1226,8 +1225,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg) SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg)
# define DTLSv1_handle_timeout(ssl) \ # define DTLSv1_handle_timeout(ssl) \
SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL) SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL)
# define SSL_session_reused(ssl) \
SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,0,NULL)
# define SSL_num_renegotiations(ssl) \ # define SSL_num_renegotiations(ssl) \
SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL) SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL)
# define SSL_clear_num_renegotiations(ssl) \ # define SSL_clear_num_renegotiations(ssl) \
@ -1812,8 +1809,11 @@ void SSL_set_not_resumable_session_callback(SSL *ssl,
int (*cb) (SSL *ssl, int (*cb) (SSL *ssl,
int int
is_forward_secure)); is_forward_secure));
# if OPENSSL_API_COMPAT < 0x10100000L
# define SSL_cache_hit(s) SSL_session_reused(s)
# endif
__owur int SSL_cache_hit(SSL *s); __owur int SSL_session_reused(SSL *s);
__owur int SSL_is_server(SSL *s); __owur int SSL_is_server(SSL *s);
__owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void); __owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void);

3
ssl/s3_lib.c
View File

@ -3455,9 +3455,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
int ret = 0; int ret = 0;
switch (cmd) { switch (cmd) {
case SSL_CTRL_GET_SESSION_REUSED:
ret = s->hit;
break;
case SSL_CTRL_GET_CLIENT_CERT_REQUEST: case SSL_CTRL_GET_CLIENT_CERT_REQUEST:
break; break;
case SSL_CTRL_GET_NUM_RENEGOTIATIONS: case SSL_CTRL_GET_NUM_RENEGOTIATIONS:

2
ssl/ssl_lib.c
View File

@ -3706,7 +3706,7 @@ int ssl_handshake_hash(SSL *s, unsigned char *out, int outlen)
return ret; return ret;
} }
int SSL_cache_hit(SSL *s) int SSL_session_reused(SSL *s)
{ {
return s->hit; return s->hit;
} }

2
util/ssleay.num
View File

@ -300,7 +300,7 @@ SSL_SESSION_get0_peer 340 1_1_0 EXIST::FUNCTION:
TLSv1_2_client_method 341 1_1_0 EXIST::FUNCTION: TLSv1_2_client_method 341 1_1_0 EXIST::FUNCTION:
SSL_SESSION_set1_id_context 342 1_1_0 EXIST::FUNCTION: SSL_SESSION_set1_id_context 342 1_1_0 EXIST::FUNCTION:
TLSv1_2_server_method 343 1_1_0 EXIST::FUNCTION: TLSv1_2_server_method 343 1_1_0 EXIST::FUNCTION:
SSL_cache_hit 344 1_1_0 EXIST::FUNCTION: SSL_session_reused 344 1_1_0 EXIST::FUNCTION:
SSL_get0_kssl_ctx 345 1_1_0 NOEXIST::FUNCTION: SSL_get0_kssl_ctx 345 1_1_0 NOEXIST::FUNCTION:
SSL_set0_kssl_ctx 346 1_1_0 NOEXIST::FUNCTION: SSL_set0_kssl_ctx 346 1_1_0 NOEXIST::FUNCTION:
SSL_SESSION_get0_id 347 1_1_0 NOEXIST::FUNCTION: SSL_SESSION_get0_id 347 1_1_0 NOEXIST::FUNCTION: