wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

EVP HMAC: get working with WOLFSSL_HMAC_COPY_HASH

Browse Source 
Get the EVP layer working with the wolfSSL HMAC implementation when
WOLFSSL_HMAC_COPY_HASH is defined.
This define hashes the ipad and opad into temporary hashes and copies
the required hash into the working hash when needed. Uses more memory
but is faster when starting a new hash with the same key.
This commit is contained in:
Sean Parkinson
2025-07-01 10:34:52 +10:00
parent 7fb750962b
commit 7c4de54e73
3 changed files with 123 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/ssl_crypto.c
View File

@@ -1472,56 +1472,136 @@ int wolfSSL_HmacCopy(Hmac* dst, Hmac* src)
#ifndef NO_MD5
case WC_MD5:
rc = wc_Md5Copy(&src->hash.md5, &dst->hash.md5);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_Md5Copy(&src->i_hash.md5, &dst->i_hash.md5);
}
if (rc == 0) {
rc = wc_Md5Copy(&src->o_hash.md5, &dst->o_hash.md5);
}
#endif
break;
#endif /* !NO_MD5 */
#ifndef NO_SHA
case WC_SHA:
rc = wc_ShaCopy(&src->hash.sha, &dst->hash.sha);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_ShaCopy(&src->i_hash.sha, &dst->i_hash.sha);
}
if (rc == 0) {
rc = wc_ShaCopy(&src->o_hash.sha, &dst->o_hash.sha);
}
#endif
break;
#endif /* !NO_SHA */
#ifdef WOLFSSL_SHA224
case WC_SHA224:
rc = wc_Sha224Copy(&src->hash.sha224, &dst->hash.sha224);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_Sha224Copy(&src->i_hash.sha224, &dst->i_hash.sha224);
}
if (rc == 0) {
rc = wc_Sha224Copy(&src->o_hash.sha224, &dst->o_hash.sha224);
}
#endif
break;
#endif /* WOLFSSL_SHA224 */
#ifndef NO_SHA256
case WC_SHA256:
rc = wc_Sha256Copy(&src->hash.sha256, &dst->hash.sha256);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_Sha256Copy(&src->i_hash.sha256, &dst->i_hash.sha256);
}
if (rc == 0) {
rc = wc_Sha256Copy(&src->o_hash.sha256, &dst->o_hash.sha256);
}
#endif
break;
#endif /* !NO_SHA256 */
#ifdef WOLFSSL_SHA384
case WC_SHA384:
rc = wc_Sha384Copy(&src->hash.sha384, &dst->hash.sha384);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_Sha384Copy(&src->i_hash.sha384, &dst->i_hash.sha384);
}
if (rc == 0) {
rc = wc_Sha384Copy(&src->o_hash.sha384, &dst->o_hash.sha384);
}
#endif
break;
#endif /* WOLFSSL_SHA384 */
#ifdef WOLFSSL_SHA512
case WC_SHA512:
rc = wc_Sha512Copy(&src->hash.sha512, &dst->hash.sha512);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_Sha512Copy(&src->i_hash.sha512, &dst->i_hash.sha512);
}
if (rc == 0) {
rc = wc_Sha512Copy(&src->o_hash.sha512, &dst->o_hash.sha512);
}
#endif
break;
#endif /* WOLFSSL_SHA512 */
#ifdef WOLFSSL_SHA3
#ifndef WOLFSSL_NOSHA3_224
case WC_SHA3_224:
rc = wc_Sha3_224_Copy(&src->hash.sha3, &dst->hash.sha3);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_Sha3_224_Copy(&src->i_hash.sha3, &dst->i_hash.sha3);
}
if (rc == 0) {
rc = wc_Sha3_224_Copy(&src->o_hash.sha3, &dst->o_hash.sha3);
}
#endif
break;
#endif /* WOLFSSL_NO_SHA3_224 */
#ifndef WOLFSSL_NOSHA3_256
case WC_SHA3_256:
rc = wc_Sha3_256_Copy(&src->hash.sha3, &dst->hash.sha3);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_Sha3_256_Copy(&src->i_hash.sha3, &dst->i_hash.sha3);
}
if (rc == 0) {
rc = wc_Sha3_256_Copy(&src->o_hash.sha3, &dst->o_hash.sha3);
}
#endif
break;
#endif /* WOLFSSL_NO_SHA3_256 */
#ifndef WOLFSSL_NOSHA3_384
case WC_SHA3_384:
rc = wc_Sha3_384_Copy(&src->hash.sha3, &dst->hash.sha3);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_Sha3_384_Copy(&src->i_hash.sha3, &dst->i_hash.sha3);
}
if (rc == 0) {
rc = wc_Sha3_384_Copy(&src->o_hash.sha3, &dst->o_hash.sha3);
}
#endif
break;
#endif /* WOLFSSL_NO_SHA3_384 */
#ifndef WOLFSSL_NOSHA3_512
case WC_SHA3_512:
rc = wc_Sha3_512_Copy(&src->hash.sha3, &dst->hash.sha3);
#ifdef WOLFSSL_HMAC_COPY_HASH
if (rc == 0) {
rc = wc_Sha3_512_Copy(&src->i_hash.sha3, &dst->i_hash.sha3);
}
if (rc == 0) {
rc = wc_Sha3_512_Copy(&src->o_hash.sha3, &dst->o_hash.sha3);
}
#endif
break;
#endif /* WOLFSSL_NO_SHA3_512 */
#endif /* WOLFSSL_SHA3 */
@@ -1823,13 +1903,24 @@ int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen,
WC_HMAC_BLOCK_SIZE);
XMEMCPY((byte *)&ctx->hmac.opad, (byte *)&ctx->save_opad,
WC_HMAC_BLOCK_SIZE);
/* Initialize the wolfSSL HMAC object. */
rc = _HMAC_Init(&ctx->hmac, ctx->hmac.macType, heap);
#ifdef WOLFSSL_HMAC_COPY_HASH
rc = _HmacInitIOHashes(&ctx->hmac);
if (rc != 0) {
WOLFSSL_MSG("hmac init error");
WOLFSSL_MSG("hmac init i_hash/o_hash error");
WOLFSSL_ERROR(rc);
ret = 0;
}
if (ret == 1)
#endif
{
/* Initialize the wolfSSL HMAC object. */
rc = _HMAC_Init(&ctx->hmac, ctx->hmac.macType, heap);
if (rc != 0) {
WOLFSSL_MSG("hmac init error");
WOLFSSL_ERROR(rc);
ret = 0;
}
}
}
return ret;

47
wolfcrypt/src/hmac.c
View File

@@ -400,6 +400,32 @@ static int HmacKeyHashUpdate(byte macType, wc_HmacHash* hash, byte* pad)
return ret;
}
#ifdef WOLFSSL_HMAC_COPY_HASH
int _HmacInitIOHashes(Hmac* hmac)
{
int ret;
#ifdef WOLF_CRYPTO_CB
int devId = hmac->devId;
#else
int devId = INVALID_DEVID;
#endif
ret = HmacKeyInitHash(&hmac->i_hash, hmac->macType, hmac->heap, devId);
if (ret == 0) {
ret = HmacKeyInitHash(&hmac->o_hash, hmac->macType, hmac->heap, devId);
}
if (ret == 0) {
ret = HmacKeyHashUpdate(hmac->macType, &hmac->i_hash,
(byte*)hmac->ipad);
}
if (ret == 0) {
ret = HmacKeyHashUpdate(hmac->macType, &hmac->o_hash,
(byte*)hmac->opad);
}
return ret;
}
#endif
int wc_HmacSetKey_ex(Hmac* hmac, int type, const byte* key, word32 length,
int allowFlag)
@@ -761,25 +787,8 @@ int wc_HmacSetKey_ex(Hmac* hmac, int type, const byte* key, word32 length,
}
#ifdef WOLFSSL_HMAC_COPY_HASH
if ( ret == 0) {
#ifdef WOLF_CRYPTO_CB
int devId = hmac->devId;
#else
int devId = INVALID_DEVID;
#endif
ret = HmacKeyInitHash(&hmac->i_hash, hmac->macType, heap, devId);
if (ret != 0)
return ret;
ret = HmacKeyInitHash(&hmac->o_hash, hmac->macType, heap, devId);
if (ret != 0)
return ret;
ret = HmacKeyHashUpdate(hmac->macType, &hmac->i_hash, ip);
if (ret != 0)
return ret;
ret = HmacKeyHashUpdate(hmac->macType, &hmac->o_hash, op);
if (ret != 0)
return ret;
if (ret == 0) {
ret = _HmacInitIOHashes(hmac);
}
#endif

1
wolfssl/wolfcrypt/hmac.h
View File

@@ -194,6 +194,7 @@ WOLFSSL_API void wc_HmacFree(Hmac* hmac);
WOLFSSL_API int wolfSSL_GetHmacMaxSize(void);
WOLFSSL_LOCAL int _InitHmac(Hmac* hmac, int type, void* heap);
WOLFSSL_LOCAL int _HmacInitIOHashes(Hmac* hmac);
#ifdef HAVE_HKDF