diff options
| author | Matt Caswell <matt@openssl.org> | 2022-11-14 14:19:53 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2023-01-24 17:16:29 +0000 |
| commit | 3f9175c7a46b13a3528d9b5776030a78eb1f9454 (patch) | |
| tree | d114752dce6626fe749c8bec4b8721424c701461 /ssl/ssl_lib.c | |
| parent | bea8d70498c9ad0e2cca3652c748d327be7b841e (diff) | |
Extend the new_record_layer function
Add the ability to pass the main secret and length, as well as the
digest used for the KDF.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19748)
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 1a5bc6d3e4..ffae69bc38 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -553,17 +553,18 @@ static int clear_record_layer(SSL_CONNECTION *s) SSL_CONNECTION_IS_DTLS(s) ? DTLS_ANY_VERSION : TLS_ANY_VERSION, OSSL_RECORD_DIRECTION_READ, - OSSL_RECORD_PROTECTION_LEVEL_NONE, + OSSL_RECORD_PROTECTION_LEVEL_NONE, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, - NID_undef, NULL, NULL); + NID_undef, NULL, NULL, NULL); ret &= ssl_set_new_record_layer(s, SSL_CONNECTION_IS_DTLS(s) ? DTLS_ANY_VERSION : TLS_ANY_VERSION, OSSL_RECORD_DIRECTION_WRITE, - OSSL_RECORD_PROTECTION_LEVEL_NONE, + OSSL_RECORD_PROTECTION_LEVEL_NONE, NULL, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0, - NID_undef, NULL, NULL); + NID_undef, NULL, NULL, NULL); + /* SSLfatal already called in the event of failure */ return ret; } |