mirror of
https://github.com/nginx/nginx.git
synced 2026-10-24 21:13:08 +00:00
QUIC: HKDF API compatibility with OpenSSL master branch.
OpenSSL 3.0 started to require HKDF-Extract output PRK length pointer
used to represent the amount of data written to contain the length of
the key buffer before the call. EVP_PKEY_derive() documents this.
See HKDF_Extract() internal implementation update in this change:
5a285ad
This commit is contained in:
parent
dd98809bef
commit
18f9330cd6
1 changed files with 2 additions and 0 deletions
|
|
@ -165,6 +165,7 @@ ngx_quic_keys_set_initial_secret(ngx_pool_t *pool, ngx_quic_keys_t *keys,
|
|||
|
||||
cipher = EVP_aes_128_gcm();
|
||||
digest = EVP_sha256();
|
||||
is_len = SHA256_DIGEST_LENGTH;
|
||||
|
||||
if (ngx_hkdf_extract(is, &is_len, digest, secret->data, secret->len,
|
||||
(version & 0xff000000) ? salt29 : salt, sizeof(salt))
|
||||
|
|
@ -968,6 +969,7 @@ ngx_quic_derive_key(ngx_log_t *log, const char *label, ngx_str_t *secret,
|
|||
uint8_t info[20];
|
||||
|
||||
digest = EVP_sha256();
|
||||
is_len = SHA256_DIGEST_LENGTH;
|
||||
|
||||
if (ngx_hkdf_extract(is, &is_len, digest, secret->data, secret->len,
|
||||
salt->data, salt->len)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue