diff options
| author | jsing <> | 2021-10-25 10:01:46 +0000 |
|---|---|---|
| committer | jsing <> | 2021-10-25 10:01:46 +0000 |
| commit | 03322a1b7dc461482621c214b0f9c68410e7205f (patch) | |
| tree | 7da475234e07731ebcbe2828153d1920d308e436 /src/lib/libssl/tls13_server.c | |
| parent | 3d93c8c633e863047cb14f254d6ed4020afc5c51 (diff) | |
| download | openbsd-03322a1b7dc461482621c214b0f9c68410e7205f.tar.gz openbsd-03322a1b7dc461482621c214b0f9c68410e7205f.tar.bz2 openbsd-03322a1b7dc461482621c214b0f9c68410e7205f.zip | |
Fold SSL_SESSION_INTERNAL back into SSL_SESSION.
ok beck@ tb@
Diffstat (limited to 'src/lib/libssl/tls13_server.c')
| -rw-r--r-- | src/lib/libssl/tls13_server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c index a19b3825fe..733a71f7d1 100644 --- a/src/lib/libssl/tls13_server.c +++ b/src/lib/libssl/tls13_server.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls13_server.c,v 1.86 2021/10/23 14:40:54 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_server.c,v 1.87 2021/10/25 10:01:46 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> |
| 4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> | 4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> |
| @@ -922,16 +922,16 @@ tls13_client_certificate_recv(struct tls13_ctx *ctx, CBS *cbs) | |||
| 922 | if ((cert_idx = ssl_cert_type(cert, pkey)) < 0) | 922 | if ((cert_idx = ssl_cert_type(cert, pkey)) < 0) |
| 923 | goto err; | 923 | goto err; |
| 924 | 924 | ||
| 925 | ssl_sess_cert_free(SSI(s)->sess_cert); | 925 | ssl_sess_cert_free(s->session->sess_cert); |
| 926 | if ((SSI(s)->sess_cert = ssl_sess_cert_new()) == NULL) | 926 | if ((s->session->sess_cert = ssl_sess_cert_new()) == NULL) |
| 927 | goto err; | 927 | goto err; |
| 928 | 928 | ||
| 929 | SSI(s)->sess_cert->cert_chain = certs; | 929 | s->session->sess_cert->cert_chain = certs; |
| 930 | certs = NULL; | 930 | certs = NULL; |
| 931 | 931 | ||
| 932 | X509_up_ref(cert); | 932 | X509_up_ref(cert); |
| 933 | SSI(s)->sess_cert->peer_pkeys[cert_idx].x509 = cert; | 933 | s->session->sess_cert->peer_pkeys[cert_idx].x509 = cert; |
| 934 | SSI(s)->sess_cert->peer_key = &(SSI(s)->sess_cert->peer_pkeys[cert_idx]); | 934 | s->session->sess_cert->peer_key = &(s->session->sess_cert->peer_pkeys[cert_idx]); |
| 935 | 935 | ||
| 936 | X509_free(s->session->peer); | 936 | X509_free(s->session->peer); |
| 937 | 937 | ||
