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/ssl_sess.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/ssl_sess.c')
-rw-r--r-- | src/lib/libssl/ssl_sess.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index cb985cadb5..76f194ca78 100644 --- a/src/lib/libssl/ssl_sess.c +++ b/src/lib/libssl/ssl_sess.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_sess.c,v 1.125 2024/03/27 06:47:52 tb Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.126 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 | * |
@@ -290,11 +290,6 @@ ssl_session_dup(SSL_SESSION *sess, int include_ticket) | |||
290 | copy->cipher = sess->cipher; | 290 | copy->cipher = sess->cipher; |
291 | copy->cipher_id = sess->cipher_id; | 291 | copy->cipher_id = sess->cipher_id; |
292 | 292 | ||
293 | if (sess->ciphers != NULL) { | ||
294 | if ((copy->ciphers = sk_SSL_CIPHER_dup(sess->ciphers)) == NULL) | ||
295 | goto err; | ||
296 | } | ||
297 | |||
298 | if (sess->tlsext_hostname != NULL) { | 293 | if (sess->tlsext_hostname != NULL) { |
299 | copy->tlsext_hostname = strdup(sess->tlsext_hostname); | 294 | copy->tlsext_hostname = strdup(sess->tlsext_hostname); |
300 | if (copy->tlsext_hostname == NULL) | 295 | if (copy->tlsext_hostname == NULL) |
@@ -881,8 +876,6 @@ SSL_SESSION_free(SSL_SESSION *ss) | |||
881 | 876 | ||
882 | X509_free(ss->peer_cert); | 877 | X509_free(ss->peer_cert); |
883 | 878 | ||
884 | sk_SSL_CIPHER_free(ss->ciphers); | ||
885 | |||
886 | free(ss->tlsext_hostname); | 879 | free(ss->tlsext_hostname); |
887 | free(ss->tlsext_tick); | 880 | free(ss->tlsext_tick); |
888 | free(ss->tlsext_ecpointformatlist); | 881 | free(ss->tlsext_ecpointformatlist); |