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/tls13_client.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/tls13_client.c')
-rw-r--r-- | src/lib/libssl/tls13_client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c index 00a1c6baa4..4dfb02581a 100644 --- a/src/lib/libssl/tls13_client.c +++ b/src/lib/libssl/tls13_client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_client.c,v 1.87 2021/10/23 14:40:54 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_client.c,v 1.88 2021/10/25 10:01:46 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -628,16 +628,16 @@ tls13_server_certificate_recv(struct tls13_ctx *ctx, CBS *cbs) | |||
628 | if ((cert_idx = ssl_cert_type(cert, pkey)) < 0) | 628 | if ((cert_idx = ssl_cert_type(cert, pkey)) < 0) |
629 | goto err; | 629 | goto err; |
630 | 630 | ||
631 | ssl_sess_cert_free(SSI(s)->sess_cert); | 631 | ssl_sess_cert_free(s->session->sess_cert); |
632 | if ((SSI(s)->sess_cert = ssl_sess_cert_new()) == NULL) | 632 | if ((s->session->sess_cert = ssl_sess_cert_new()) == NULL) |
633 | goto err; | 633 | goto err; |
634 | 634 | ||
635 | SSI(s)->sess_cert->cert_chain = certs; | 635 | s->session->sess_cert->cert_chain = certs; |
636 | certs = NULL; | 636 | certs = NULL; |
637 | 637 | ||
638 | X509_up_ref(cert); | 638 | X509_up_ref(cert); |
639 | SSI(s)->sess_cert->peer_pkeys[cert_idx].x509 = cert; | 639 | s->session->sess_cert->peer_pkeys[cert_idx].x509 = cert; |
640 | SSI(s)->sess_cert->peer_key = &(SSI(s)->sess_cert->peer_pkeys[cert_idx]); | 640 | s->session->sess_cert->peer_key = &(s->session->sess_cert->peer_pkeys[cert_idx]); |
641 | 641 | ||
642 | X509_free(s->session->peer); | 642 | X509_free(s->session->peer); |
643 | 643 | ||