diff options
author | jsing <> | 2021-10-25 10:01:46 +0000 |
---|---|---|
committer | jsing <> | 2021-10-25 10:01:46 +0000 |
commit | b56105c2617b86206d3688dd7940aa6e553af6e1 (patch) | |
tree | 7da475234e07731ebcbe2828153d1920d308e436 /src/lib/libssl/ssl_srvr.c | |
parent | 75891c69eb8972c8d768d8bd1068a807ba084652 (diff) | |
download | openbsd-b56105c2617b86206d3688dd7940aa6e553af6e1.tar.gz openbsd-b56105c2617b86206d3688dd7940aa6e553af6e1.tar.bz2 openbsd-b56105c2617b86206d3688dd7940aa6e553af6e1.zip |
Fold SSL_SESSION_INTERNAL back into SSL_SESSION.
ok beck@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r-- | src/lib/libssl/ssl_srvr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c index ec1e69a8bb..42f64bf86d 100644 --- a/src/lib/libssl/ssl_srvr.c +++ b/src/lib/libssl/ssl_srvr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_srvr.c,v 1.122 2021/10/23 14:40:54 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_srvr.c,v 1.123 2021/10/25 10:01:46 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 | * |
@@ -2433,15 +2433,15 @@ ssl3_get_client_certificate(SSL *s) | |||
2433 | * With the current implementation, sess_cert will always be NULL | 2433 | * With the current implementation, sess_cert will always be NULL |
2434 | * when we arrive here | 2434 | * when we arrive here |
2435 | */ | 2435 | */ |
2436 | if (SSI(s)->sess_cert == NULL) { | 2436 | if (s->session->sess_cert == NULL) { |
2437 | SSI(s)->sess_cert = ssl_sess_cert_new(); | 2437 | s->session->sess_cert = ssl_sess_cert_new(); |
2438 | if (SSI(s)->sess_cert == NULL) { | 2438 | if (s->session->sess_cert == NULL) { |
2439 | SSLerror(s, ERR_R_MALLOC_FAILURE); | 2439 | SSLerror(s, ERR_R_MALLOC_FAILURE); |
2440 | goto err; | 2440 | goto err; |
2441 | } | 2441 | } |
2442 | } | 2442 | } |
2443 | sk_X509_pop_free(SSI(s)->sess_cert->cert_chain, X509_free); | 2443 | sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free); |
2444 | SSI(s)->sess_cert->cert_chain = sk; | 2444 | s->session->sess_cert->cert_chain = sk; |
2445 | 2445 | ||
2446 | /* | 2446 | /* |
2447 | * Inconsistency alert: cert_chain does *not* include the | 2447 | * Inconsistency alert: cert_chain does *not* include the |