aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/ssl_sess.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-12-03 17:25:26 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-12-03 17:25:26 +0000
commit145e3a85931a836f8dccec73e02594f7255abcfd (patch)
tree03b95bb4075b5bfadd5b0dabf3c4233035d6b774 /ssl/ssl_sess.c
parentd7a2d00e5375699d95f3720a7b779ded3c805b5f (diff)
downloadsrc-vendor/openssl-0.9.8.tar.gz
src-vendor/openssl-0.9.8.zip
Notes
Notes: svn path=/vendor-crypto/openssl/dist-0.9.8/; revision=291711 svn path=/vendor-crypto/openssl/0.9.8zh/; revision=291712; tag=vendor/openssl/0.9.8zh
Diffstat (limited to 'ssl/ssl_sess.c')
-rw-r--r--ssl/ssl_sess.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index e1695ab40601..51c02dc9edd6 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -156,8 +156,8 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
dest->ciphers = NULL;
#ifndef OPENSSL_NO_TLSEXT
dest->tlsext_hostname = NULL;
-#endif
dest->tlsext_tick = NULL;
+#endif
memset(&dest->ex_data, 0, sizeof(dest->ex_data));
/* We deliberately don't copy the prev and next pointers */
@@ -190,7 +190,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
goto err;
}
}
-#endif
if (ticket != 0) {
dest->tlsext_tick = BUF_memdup(src->tlsext_tick, src->tlsext_ticklen);
@@ -200,6 +199,7 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket)
dest->tlsext_tick_lifetime_hint = 0;
dest->tlsext_ticklen = 0;
}
+#endif
return dest;
err: