summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_sess.c
diff options
context:
space:
mode:
authorjsing <>2017-01-23 13:36:13 +0000
committerjsing <>2017-01-23 13:36:13 +0000
commit0eff443f2ac1ae9043870f2d40d9dc0d57f236d6 (patch)
tree84ee9c4c985fe1078df40f818b7697846dba1c18 /src/lib/libssl/ssl_sess.c
parent76088a8d37b68292f56046a6a4dea9544ad5ab89 (diff)
downloadopenbsd-0eff443f2ac1ae9043870f2d40d9dc0d57f236d6.tar.gz
openbsd-0eff443f2ac1ae9043870f2d40d9dc0d57f236d6.tar.bz2
openbsd-0eff443f2ac1ae9043870f2d40d9dc0d57f236d6.zip
Split most of SSL_METHOD out into an internal variant, which is opaque.
Discussed with beck@
Diffstat (limited to 'src/lib/libssl/ssl_sess.c')
-rw-r--r--src/lib/libssl/ssl_sess.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 52a04d3094..f44fdcc419 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.62 2017/01/23 06:45:30 beck Exp $ */ 1/* $OpenBSD: ssl_sess.c,v 1.63 2017/01/23 13:36:13 jsing 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 *
@@ -725,9 +725,9 @@ SSL_set_session(SSL *s, SSL_SESSION *session)
725 const SSL_METHOD *meth; 725 const SSL_METHOD *meth;
726 726
727 if (session != NULL) { 727 if (session != NULL) {
728 meth = s->ctx->method->get_ssl_method(session->ssl_version); 728 meth = s->ctx->method->internal->get_ssl_method(session->ssl_version);
729 if (meth == NULL) 729 if (meth == NULL)
730 meth = s->method->get_ssl_method(session->ssl_version); 730 meth = s->method->internal->get_ssl_method(session->ssl_version);
731 if (meth == NULL) { 731 if (meth == NULL) {
732 SSLerr(SSL_F_SSL_SET_SESSION, 732 SSLerr(SSL_F_SSL_SET_SESSION,
733 SSL_R_UNABLE_TO_FIND_SSL_METHOD); 733 SSL_R_UNABLE_TO_FIND_SSL_METHOD);
@@ -739,7 +739,6 @@ SSL_set_session(SSL *s, SSL_SESSION *session)
739 return (0); 739 return (0);
740 } 740 }
741 741
742
743 /* CRYPTO_w_lock(CRYPTO_LOCK_SSL);*/ 742 /* CRYPTO_w_lock(CRYPTO_LOCK_SSL);*/
744 CRYPTO_add(&session->references, 1, CRYPTO_LOCK_SSL_SESSION); 743 CRYPTO_add(&session->references, 1, CRYPTO_LOCK_SSL_SESSION);
745 if (s->session != NULL) 744 if (s->session != NULL)