summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_sess.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-01-20 16:02:07 +0000
committerMatt Caswell <matt@openssl.org>2017-01-30 10:18:23 +0000
commit1f5b44e943d911c3d0bf1445a6dab60798a66408 (patch)
tree783e9e0cb8a7532f0eecd5b67b77e902aac0e2f0 /ssl/ssl_sess.c
parent6df55cac1a2c4441a70d15875ab22530251509ce (diff)
Miscellaneous style tweaks based on feedback received
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2259)
Diffstat (limited to 'ssl/ssl_sess.c')
-rw-r--r--ssl/ssl_sess.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 77c917f38a..2ef0006649 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -620,13 +620,12 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello)
s->session_ctx->stats.sess_hit++;
s->verify_result = s->session->verify_result;
-
return 1;
err:
if (ret != NULL) {
SSL_SESSION_free(ret);
- /* In TLSv1.3 we already set s->session, so better NULL it out */
+ /* In TLSv1.3 s->session was already set to ret, so we NULL it out */
if (SSL_IS_TLS13(s))
s->session = NULL;