summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authorjsing <>2017-01-23 01:22:08 +0000
committerjsing <>2017-01-23 01:22:08 +0000
commitfdee32bae021d93d570e88a1dbbea0b3bad2c1e0 (patch)
tree0516913107a84da915d173ba7ce7df2e5e964a93 /src/lib/libssl/s3_srvr.c
parenta52552c2ca63345dc67023aa087ad6048779e0d3 (diff)
downloadopenbsd-fdee32bae021d93d570e88a1dbbea0b3bad2c1e0.tar.gz
openbsd-fdee32bae021d93d570e88a1dbbea0b3bad2c1e0.tar.bz2
openbsd-fdee32bae021d93d570e88a1dbbea0b3bad2c1e0.zip
Move not_resumable and sess_cert from SSL_SESSION to internal.
ok beck@
Diffstat (limited to 'src/lib/libssl/s3_srvr.c')
-rw-r--r--src/lib/libssl/s3_srvr.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index a18b218207..ebdb10cb91 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.142 2017/01/23 00:12:54 jsing Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.143 2017/01/23 01:22:08 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 *
@@ -2593,17 +2593,17 @@ ssl3_get_client_certificate(SSL *s)
2593 * With the current implementation, sess_cert will always be NULL 2593 * With the current implementation, sess_cert will always be NULL
2594 * when we arrive here 2594 * when we arrive here
2595 */ 2595 */
2596 if (s->session->sess_cert == NULL) { 2596 if (SSI(s)->sess_cert == NULL) {
2597 s->session->sess_cert = ssl_sess_cert_new(); 2597 SSI(s)->sess_cert = ssl_sess_cert_new();
2598 if (s->session->sess_cert == NULL) { 2598 if (SSI(s)->sess_cert == NULL) {
2599 SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, 2599 SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,
2600 ERR_R_MALLOC_FAILURE); 2600 ERR_R_MALLOC_FAILURE);
2601 goto err; 2601 goto err;
2602 } 2602 }
2603 } 2603 }
2604 if (s->session->sess_cert->cert_chain != NULL) 2604 if (SSI(s)->sess_cert->cert_chain != NULL)
2605 sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free); 2605 sk_X509_pop_free(SSI(s)->sess_cert->cert_chain, X509_free);
2606 s->session->sess_cert->cert_chain = sk; 2606 SSI(s)->sess_cert->cert_chain = sk;
2607 2607
2608 /* 2608 /*
2609 * Inconsistency alert: cert_chain does *not* include the 2609 * Inconsistency alert: cert_chain does *not* include the