summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_sess.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_sess.c')
-rw-r--r--src/lib/libssl/ssl_sess.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 8700e851c6..541b143384 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_sess.c,v 1.58 2017/01/23 04:15:28 jsing Exp $ */ 1/* $OpenBSD: ssl_sess.c,v 1.59 2017/01/23 04:55:27 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -326,8 +326,8 @@ ssl_get_new_session(SSL *s, int session)
326 326
327 /* Choose which callback will set the session ID. */ 327 /* Choose which callback will set the session ID. */
328 CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX); 328 CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
329 if (s->generate_session_id) 329 if (s->internal->generate_session_id)
330 cb = s->generate_session_id; 330 cb = s->internal->generate_session_id;
331 else if (s->session_ctx->internal->generate_session_id) 331 else if (s->session_ctx->internal->generate_session_id)
332 cb = s->session_ctx->internal->generate_session_id; 332 cb = s->session_ctx->internal->generate_session_id;
333 CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX); 333 CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX);
@@ -849,8 +849,8 @@ SSL_set_session_secret_cb(SSL *s, int (*tls_session_secret_cb)(SSL *s,
849{ 849{
850 if (s == NULL) 850 if (s == NULL)
851 return (0); 851 return (0);
852 s->tls_session_secret_cb = tls_session_secret_cb; 852 s->internal->tls_session_secret_cb = tls_session_secret_cb;
853 s->tls_session_secret_cb_arg = arg; 853 s->internal->tls_session_secret_cb_arg = arg;
854 return (1); 854 return (1);
855} 855}
856 856
@@ -860,8 +860,8 @@ SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
860{ 860{
861 if (s == NULL) 861 if (s == NULL)
862 return (0); 862 return (0);
863 s->tls_session_ticket_ext_cb = cb; 863 s->internal->tls_session_ticket_ext_cb = cb;
864 s->tls_session_ticket_ext_cb_arg = arg; 864 s->internal->tls_session_ticket_ext_cb_arg = arg;
865 return (1); 865 return (1);
866} 866}
867 867