DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

OpenSSL: Add TLS 1.3 signature algorithms for Suite B

Browse source 
These are needed to allow the Suite B 192-bit negotiation to succeed
when using TLS 1.3 (which is still disabled by default).

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2023-03-22 23:58:47 +02:00 committed by Jouni Malinen
parent cf8f13ac85
commit d17fca576c
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/crypto/tls_openssl.c
View file

@ -3238,17 +3238,31 @@ static int tls_set_conn_flags(struct tls_connection *conn, unsigned int flags,
} }
if (flags & (TLS_CONN_SUITEB | TLS_CONN_SUITEB_NO_ECDH)) { if (flags & (TLS_CONN_SUITEB | TLS_CONN_SUITEB_NO_ECDH)) {
#ifdef OPENSSL_IS_BORINGSSL #ifdef OPENSSL_IS_BORINGSSL
uint16_t sigalgs[1] = { SSL_SIGN_RSA_PKCS1_SHA384 }; uint16_t sigalgs[3] = { SSL_SIGN_RSA_PKCS1_SHA384 };
int num = 1;
if (!(flags & TLS_CONN_DISABLE_TLSv1_3)) {
#ifdef SSL_SIGN_ECDSA_SECP384R1_SHA384
sigalgs[num++] = SSL_SIGN_ECDSA_SECP384R1_SHA384;
#endif
#ifdef SSL_SIGN_RSA_PSS_RSAE_SHA384
sigalgs[num++] = SSL_SIGN_RSA_PSS_RSAE_SHA384;
#endif
}
if (SSL_CTX_set_verify_algorithm_prefs(conn->ssl_ctx, sigalgs, if (SSL_CTX_set_verify_algorithm_prefs(conn->ssl_ctx, sigalgs,
1) != 1) { num) != 1) {
wpa_printf(MSG_INFO, wpa_printf(MSG_INFO,
"OpenSSL: Failed to set Suite B sigalgs"); "OpenSSL: Failed to set Suite B sigalgs");
return -1; return -1;
} }
#else /* OPENSSL_IS_BORINGSSL */ #else /* OPENSSL_IS_BORINGSSL */
/* ECDSA+SHA384 if need to add EC support here */ /* ECDSA+SHA384 if need to add EC support here */
if (SSL_set1_sigalgs_list(ssl, "RSA+SHA384") != 1) { const char *algs = "RSA+SHA384";
if (!(flags & TLS_CONN_DISABLE_TLSv1_3))
algs = "RSA+SHA384:ecdsa_secp384r1_sha384:rsa_pss_rsae_sha384";
if (SSL_set1_sigalgs_list(ssl, algs) != 1) {
wpa_printf(MSG_INFO, wpa_printf(MSG_INFO,
"OpenSSL: Failed to set Suite B sigalgs"); "OpenSSL: Failed to set Suite B sigalgs");
return -1; return -1;