diff options
author | jsing <> | 2024-07-19 08:54:31 +0000 |
---|---|---|
committer | jsing <> | 2024-07-19 08:54:31 +0000 |
commit | f8eff50c9ac6772239e96a6d2031a83bac497a15 (patch) | |
tree | faf36fc4d6d297dc2dbbbf4f2ae929c52d7b8659 /src/lib/libssl/s3_lib.c | |
parent | 3fa5af1454ae7609f20a01e928e9cbba8f9df68f (diff) | |
download | openbsd-f8eff50c9ac6772239e96a6d2031a83bac497a15.tar.gz openbsd-f8eff50c9ac6772239e96a6d2031a83bac497a15.tar.bz2 openbsd-f8eff50c9ac6772239e96a6d2031a83bac497a15.zip |
Move client ciphers from SSL_SESSION to SSL_HANDSHAKE.
SSL_SESSION has a 'ciphers' member which contains a list of ciphers
that were advertised by the client. Move this from SSL_SESSION to
SSL_HANDSHAKE and rename it to match reality.
ok tb@
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 5fc42ca200..38e7ba7f19 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.254 2024/07/16 14:38:04 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.255 2024/07/19 08:54:31 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 | * |
@@ -1478,6 +1478,8 @@ ssl3_free(SSL *s) | |||
1478 | tls_buffer_free(s->s3->handshake_fragment); | 1478 | tls_buffer_free(s->s3->handshake_fragment); |
1479 | 1479 | ||
1480 | freezero(s->s3->hs.sigalgs, s->s3->hs.sigalgs_len); | 1480 | freezero(s->s3->hs.sigalgs, s->s3->hs.sigalgs_len); |
1481 | |||
1482 | sk_SSL_CIPHER_free(s->s3->hs.client_ciphers); | ||
1481 | sk_X509_pop_free(s->s3->hs.peer_certs, X509_free); | 1483 | sk_X509_pop_free(s->s3->hs.peer_certs, X509_free); |
1482 | sk_X509_pop_free(s->s3->hs.peer_certs_no_leaf, X509_free); | 1484 | sk_X509_pop_free(s->s3->hs.peer_certs_no_leaf, X509_free); |
1483 | sk_X509_pop_free(s->s3->hs.verified_chain, X509_free); | 1485 | sk_X509_pop_free(s->s3->hs.verified_chain, X509_free); |
@@ -1522,6 +1524,8 @@ ssl3_clear(SSL *s) | |||
1522 | s->s3->hs.sigalgs = NULL; | 1524 | s->s3->hs.sigalgs = NULL; |
1523 | s->s3->hs.sigalgs_len = 0; | 1525 | s->s3->hs.sigalgs_len = 0; |
1524 | 1526 | ||
1527 | sk_SSL_CIPHER_free(s->s3->hs.client_ciphers); | ||
1528 | s->s3->hs.client_ciphers = NULL; | ||
1525 | sk_X509_pop_free(s->s3->hs.peer_certs, X509_free); | 1529 | sk_X509_pop_free(s->s3->hs.peer_certs, X509_free); |
1526 | s->s3->hs.peer_certs = NULL; | 1530 | s->s3->hs.peer_certs = NULL; |
1527 | sk_X509_pop_free(s->s3->hs.peer_certs_no_leaf, X509_free); | 1531 | sk_X509_pop_free(s->s3->hs.peer_certs_no_leaf, X509_free); |