diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2024-07-14 15:39:37 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2024-07-14 15:39:37 +0000 |
| commit | 0ad0151e17fa68b36f7b66b16f26b3c89e2bd1f6 (patch) | |
| tree | a345d65d6974aa970bcf32fbb70572b3fc6f0ab8 /lib/libssl/ssl_ciph.c | |
| parent | 9714fac7d3dec9df4713d409c321995e7742f42d (diff) | |
Prepare to provide SSL_CIPHER_get_handshake_digest()
Needed by newer freeradius. This is a straightforward implementation that
essentially duplicates tls13_cipher_hash().
ok jsing
Diffstat (limited to 'lib/libssl/ssl_ciph.c')
| -rw-r--r-- | lib/libssl/ssl_ciph.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c index a01465d9e0f..13790c56be1 100644 --- a/lib/libssl/ssl_ciph.c +++ b/lib/libssl/ssl_ciph.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_ciph.c,v 1.142 2024/05/09 07:55:48 tb Exp $ */ +/* $OpenBSD: ssl_ciph.c,v 1.143 2024/07/14 15:39:36 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -524,6 +524,7 @@ ssl_get_handshake_evp_md(SSL *s, const EVP_MD **md) handshake_mac = s->s3->hs.cipher->algorithm2 & SSL_HANDSHAKE_MAC_MASK; + /* XXX - can we simplify this now that TLSv1.0 and TLSv1.1 are gone? */ /* For TLSv1.2 we upgrade the default MD5+SHA1 MAC to SHA256. */ if (SSL_USE_SHA256_PRF(s) && handshake_mac == SSL_HANDSHAKE_MAC_DEFAULT) handshake_mac = SSL_HANDSHAKE_MAC_SHA256; @@ -1624,6 +1625,21 @@ SSL_CIPHER_get_auth_nid(const SSL_CIPHER *c) } LSSL_ALIAS(SSL_CIPHER_get_auth_nid); +const EVP_MD * +SSL_CIPHER_get_handshake_digest(const SSL_CIPHER *c) +{ + switch (c->algorithm2 & SSL_HANDSHAKE_MAC_MASK) { + case SSL_HANDSHAKE_MAC_DEFAULT: + case SSL_HANDSHAKE_MAC_SHA256: + return EVP_sha256(); + case SSL_HANDSHAKE_MAC_SHA384: + return EVP_sha384(); + default: + return NULL; + } +} +LSSL_ALIAS(SSL_CIPHER_get_handshake_digest); + int SSL_CIPHER_is_aead(const SSL_CIPHER *c) { |