openssl/ssl, branch OpenSSL_1_1_1j

Update copyright year

2021-02-16T15:17:22Z

Reviewed-by: Richard Levitte

Remove unused 'peer_type' from SSL_SESSION

2021-02-10T06:15:18Z

This field has not been used since #3858 was merged in 2017 when we moved to a table-based lookup for certificate type properties instead of an index-based one. Reviewed-by: Kurt Roeckx (Merged from https://github.com/openssl/openssl/pull/13991) (cherry picked from commit 3bc0b621a7baf1a11bc5cad69a287ad093674d68)

Fix for negative return value from `SSL_CTX_sess_accept()`

2021-01-08T23:05:24Z

Fixes #13183 From the original issue report, before this commit, on master and on 1.1.1, the issue can be detected with the following steps: - Start with a default SSL_CTX, initiate a TLS 1.3 connection with SNI, "Accept" count of default context gets incremented - After servername lookup, "Accept" count of default context gets decremented and that of SNI context is incremented - Server sends a "Hello Retry Request" - Client sends the second "Client Hello", now again "Accept" count of default context is decremented. Hence giving a negative value. This commit fixes it by adding a check on `s->hello_retry_request` in addition to `SSL_IS_FIRST_HANDSHAKE(s)`, to ensure the counter is moved only on the first ClientHello. CLA: trivial Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/13297)

Ensure DTLS free functions can handle NULL

2021-01-08T10:36:53Z

Our free functions should be able to deal with the case where the object being freed is NULL. This turns out to not be quite the case for DTLS related objects. Fixes #13649 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13655) (cherry picked from commit d0afb30ef3950cacff50ec539e90073b95a276df)

Modify is_tls13_capable() to take account of the servername cb

2020-12-10T11:34:23Z

A servername cb may change the available certificates, so if we have one set then we cannot rely on the configured certificates to determine if we are capable of negotiating TLSv1.3 or not. Fixes #13291 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13305)

Update copyright year

2020-12-08T13:09:25Z

Reviewed-by: Richard Levitte

Fix comment in do_dtls1_write()

2020-12-02T23:35:34Z

This code started off as a copy of ssl3_write_bytes(), and the comment was not updated with the implementation. Reported by yangyangtiantianlonglong in #13518 Reviewed-by: Shane Lontis Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/13566) (cherry picked from commit 70cae332a2c200087605f94cdccfee80c9380fbf)

Unify ssl3_get_cipher_by_std_name() implementation

2020-10-29T22:29:31Z

The handling for the SCSVs was the same as for regular ciphers; just merge them into the same table-driven handler. Reviewed-by: Paul Dale (cherry picked from commit 231849bc9ca69dfd3adf40821421d8e2d804d8e8) (Merged from https://github.com/openssl/openssl/pull/13280)

optimise ssl3_get_cipher_by_std_name()

2020-10-29T22:29:27Z

Return immediately on matched cipher. Without this patch the code only breaks out of the inner for loop, meaning for a matched TLS13 cipher the code will still loop through 160ish SSL3 ciphers. CLA: trivial Reviewed-by: Paul Dale Reviewed-by: Dmitry Belyavskiy (cherry picked from commit d93bded6aa2852e681de2ed76fb43c415687af68) Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/13280)

Ensure we raise SSLfatal on error

2020-10-26T16:20:13Z

We were missing a call to SSLfatal. A comment claimed that we had already called it - but that is incorrect. Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/13230)