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/record/methods/tls_common.c | |
| parent | bea8d70498c9ad0e2cca3652c748d327be7b841e (diff) | |
| download | openssl-3f9175c7a46b13a3528d9b5776030a78eb1f9454.tar.gz | |
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/record/methods/tls_common.c')
| -rw-r--r-- | ssl/record/methods/tls_common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c index 9fca10c50e..91d1545085 100644 --- a/ssl/record/methods/tls_common.c +++ b/ssl/record/methods/tls_common.c @@ -1324,12 +1324,14 @@ tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers, static int tls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers, int role, int direction, int level, uint16_t epoch, + unsigned char *secret, size_t secretlen, unsigned char *key, size_t keylen, unsigned char *iv, size_t ivlen, unsigned char *mackey, size_t mackeylen, const EVP_CIPHER *ciph, size_t taglen, int mactype, - const EVP_MD *md, COMP_METHOD *comp, BIO *prev, - BIO *transport, BIO *next, BIO_ADDR *local, BIO_ADDR *peer, + const EVP_MD *md, COMP_METHOD *comp, + const EVP_MD *kdfdigest, BIO *prev, BIO *transport, + BIO *next, BIO_ADDR *local, BIO_ADDR *peer, const OSSL_PARAM *settings, const OSSL_PARAM *options, const OSSL_DISPATCH *fns, void *cbarg, void *rlarg, OSSL_RECORD_LAYER **retrl) |