Skip to content

Update TLS 1.3 KDF to use proper wolfcrypt FIPS APIs #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ColtonWilley wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update TLS 1.3 KDF to use proper wolfcrypt FIPS APIs #352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 15 additions & 29 deletions src/wp_hkdf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#include <wolfprovider/alg_funcs.h>
#include <wolfprovider/internal.h>
#include <wolfssl/wolfcrypt/kdf.h>

/**
* Define WP_HKDF_NULL_SALT_ALLOWED for OpenSSL versions that allow NULL salt in HKDF.
Expand Down Expand Up @@ -571,7 +572,6 @@ static int wp_tls13_hkdf_expand(wp_HkdfCtx* ctx, unsigned char* inKey,
size_t keyLen)
{
int ok = 1;
size_t idx = 0;
int rc;

WOLFPROV_ENTER(WP_LOG_COMP_HKDF, "wp_tls13_hkdf_expand");
Expand All @@ -582,32 +582,17 @@ static int wp_tls13_hkdf_expand(wp_HkdfCtx* ctx, unsigned char* inKey,
"TLS1.3 HKDF expand: prefixLen=%zu, labelLen=%zu",
ctx->prefixLen, ctx->labelLen);

/* Construct info to expand from:
* - output key length
* - label
* - prefix/protocol
* - data
*/
ctx->info[idx++] = (byte)(keyLen >> 8);
ctx->info[idx++] = (byte)keyLen;
ctx->info[idx++] = (byte)(ctx->prefixLen + ctx->labelLen);
XMEMCPY(ctx->info + idx, ctx->prefix, ctx->prefixLen);
idx += ctx->prefixLen;
XMEMCPY(ctx->info + idx, ctx->label, ctx->labelLen);
idx += ctx->labelLen;
ctx->info[idx++] = (byte)(dataLen);
if (dataLen > 0) {
XMEMCPY(ctx->info + idx, data, dataLen);
idx += dataLen;
}
ctx->infoSz = idx;

PRIVATE_KEY_UNLOCK();
rc = wc_HKDF_Expand(ctx->mdType, inKey, (word32)inKeyLen, ctx->info,
(word32)ctx->infoSz, key, (word32)keyLen);
rc = wc_Tls13_HKDF_Expand_Label(key, (word32)keyLen,
inKey, (word32)inKeyLen,
ctx->prefix, (word32)ctx->prefixLen,
ctx->label, (word32)ctx->labelLen,
data, (word32)dataLen,
ctx->mdType);
PRIVATE_KEY_LOCK();
if (rc != 0) {
WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_LEVEL_DEBUG, "wc_HKDF_Expand", rc);
WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_LEVEL_DEBUG,
"wc_Tls13_HKDF_Expand_Label", rc);
ok = 0;
}

Expand Down Expand Up @@ -674,16 +659,17 @@ static int wp_tls13_hkdf_extract(wp_HkdfCtx* ctx, unsigned char* key,
(void)keyLen;
PRIVATE_KEY_UNLOCK();
if (saltLen == 0) {
rc = wc_HKDF_Extract(ctx->mdType, NULL, 0, inKey,
(word32)inKeyLen, key);
rc = wc_Tls13_HKDF_Extract(key, NULL, 0, inKey,
(word32)inKeyLen, ctx->mdType);
}
else {
rc = wc_HKDF_Extract(ctx->mdType, salt, (word32)saltLen, inKey,
(word32)inKeyLen, key);
rc = wc_Tls13_HKDF_Extract(key, salt, (word32)saltLen, inKey,
(word32)inKeyLen, ctx->mdType);
}
PRIVATE_KEY_LOCK();
if (rc != 0) {
WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_LEVEL_DEBUG, "wc_HKDF_Extract", rc);
WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_LEVEL_DEBUG,
"wc_Tls13_HKDF_Extract", rc);
ok = 0;
}
}
Expand Down
Loading