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/s3_lib.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/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 8a96a2cdef..71b86770ca 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.216 2021/10/24 09:15:00 beck Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.217 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 | * |
@@ -1668,10 +1668,10 @@ _SSL_get_peer_tmp_key(SSL *s, EVP_PKEY **key) | |||
1668 | 1668 | ||
1669 | *key = NULL; | 1669 | *key = NULL; |
1670 | 1670 | ||
1671 | if (s->session == NULL || SSI(s)->sess_cert == NULL) | 1671 | if (s->session == NULL || s->session->sess_cert == NULL) |
1672 | return 0; | 1672 | return 0; |
1673 | 1673 | ||
1674 | sc = SSI(s)->sess_cert; | 1674 | sc = s->session->sess_cert; |
1675 | 1675 | ||
1676 | if ((pkey = EVP_PKEY_new()) == NULL) | 1676 | if ((pkey = EVP_PKEY_new()) == NULL) |
1677 | return 0; | 1677 | return 0; |