summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
authorjsing <>2024-07-19 08:54:31 +0000
committerjsing <>2024-07-19 08:54:31 +0000
commitf8eff50c9ac6772239e96a6d2031a83bac497a15 (patch)
treefaf36fc4d6d297dc2dbbbf4f2ae929c52d7b8659 /src/lib/libssl/ssl_lib.c
parent3fa5af1454ae7609f20a01e928e9cbba8f9df68f (diff)
downloadopenbsd-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_lib.c')
-rw-r--r--src/lib/libssl/ssl_lib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index d78cb2ac3a..4b86b70db8 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.326 2024/07/11 13:48:52 tb Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.327 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 *
@@ -1528,9 +1528,9 @@ LSSL_ALIAS(SSL_get_ciphers);
1528STACK_OF(SSL_CIPHER) * 1528STACK_OF(SSL_CIPHER) *
1529SSL_get_client_ciphers(const SSL *s) 1529SSL_get_client_ciphers(const SSL *s)
1530{ 1530{
1531 if (s == NULL || s->session == NULL || !s->server) 1531 if (s == NULL || !s->server)
1532 return NULL; 1532 return NULL;
1533 return s->session->ciphers; 1533 return s->s3->hs.client_ciphers;
1534} 1534}
1535LSSL_ALIAS(SSL_get_client_ciphers); 1535LSSL_ALIAS(SSL_get_client_ciphers);
1536 1536
@@ -1713,10 +1713,10 @@ SSL_get_shared_ciphers(const SSL *s, char *buf, int len)
1713 char *end; 1713 char *end;
1714 int i; 1714 int i;
1715 1715
1716 if (!s->server || s->session == NULL || len < 2) 1716 if (!s->server || len < 2)
1717 return NULL; 1717 return NULL;
1718 1718
1719 if ((client_ciphers = s->session->ciphers) == NULL) 1719 if ((client_ciphers = s->s3->hs.client_ciphers) == NULL)
1720 return NULL; 1720 return NULL;
1721 if ((server_ciphers = SSL_get_ciphers(s)) == NULL) 1721 if ((server_ciphers = SSL_get_ciphers(s)) == NULL)
1722 return NULL; 1722 return NULL;