openssl/ssl, branch openssl-3.3.2

Copyright year updates

2024-09-03T12:44:27Z

Reviewed-by: Neil Horman Release: yes

Check for excess data in CertificateVerify

2024-08-29T17:32:14Z

As reported by Alicja Kario, we ignored excess bytes after the signature payload in TLS CertificateVerify Messages. These should not be present. Fixes: #25298 Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/25302) (cherry picked from commit b4e4bf29ba3c67662c60ceed9afa2dd301e93273)

Do not implicitly start connection with SSL_handle_events() or SSL_poll()

2024-08-03T13:44:51Z

Reviewed-by: Neil Horman Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/25069) (cherry picked from commit ca1d2db291530a827555b40974ed81efb91c2d19)

Return infinity time from SSL_get_event_timeout when the connection is not started

2024-08-03T13:44:50Z

Reviewed-by: Neil Horman Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/25069) (cherry picked from commit b1f4aebb74192afb197487bf6f4998fbb87cd1c1)

Do not falsely start the connection through SSL_pending()/_has_pending()

2024-08-03T13:44:46Z

Fixes #25054 Reviewed-by: Neil Horman Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/25069) (cherry picked from commit b7f93c7fcb37c81b88895c3e8d22ad69c2576cd4)

Add ALPN validation in the client

2024-06-27T09:32:15Z

The ALPN protocol selected by the server must be one that we originally advertised. We should verify that it is. Follow on from CVE-2024-5535 Reviewed-by: Tomas Mraz Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/24716) (cherry picked from commit 238fa464d6e38aa2c92af70ef9580c74cff512e4)

Correct return values for tls_construct_stoc_next_proto_neg

2024-06-27T09:32:15Z

Return EXT_RETURN_NOT_SENT in the event that we don't send the extension, rather than EXT_RETURN_SENT. This actually makes no difference at all to the current control flow since this return value is ignored in this case anyway. But lets make it correct anyway. Follow on from CVE-2024-5535 Reviewed-by: Tomas Mraz Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/24716) (cherry picked from commit e10a3a84bf73a3e6024c338b51f2fb4e78a3dee9)

Use correctly formatted ALPN data in tserver

2024-06-27T09:32:15Z

The QUIC test server was using incorrectly formatted ALPN data. With the previous implementation of SSL_select_next_proto this went unnoticed. With the new stricter implemenation it was failing. Follow on from CVE-2024-5535 Reviewed-by: Tomas Mraz Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/24716) (cherry picked from commit fc8ff75814767d6c55ea78d05adc72cd346d0f0a)

More correctly handle a selected_len of 0 when processing NPN

2024-06-27T09:32:15Z

In the case where the NPN callback returns with SSL_TLEXT_ERR_OK, but the selected_len is 0 we should fail. Previously this would fail with an internal_error alert because calling OPENSSL_malloc(selected_len) will return NULL when selected_len is 0. We make this error detection more explicit and return a handshake failure alert. Follow on from CVE-2024-5535 Reviewed-by: Tomas Mraz Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/24716) (cherry picked from commit c6e1ea223510bb7104bf0c41c0c45eda5a16b718)

Fix SSL_select_next_proto

2024-06-27T09:32:15Z

Ensure that the provided client list is non-NULL and starts with a valid entry. When called from the ALPN callback the client list should already have been validated by OpenSSL so this should not cause a problem. When called from the NPN callback the client list is locally configured and will not have already been validated. Therefore SSL_select_next_proto should not assume that it is correctly formatted. We implement stricter checking of the client protocol list. We also do the same for the server list while we are about it. CVE-2024-5535 Reviewed-by: Tomas Mraz Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/24716) (cherry picked from commit 2ebbe2d7ca8551c4cb5fbb391ab9af411708090e)