feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

RISC-V 64-bit: fix raw hash when using crypto instructions

Browse Source 
./configure CC=riscv64-linux-gnu-gcc --host=riscv64 --disable-shared LDFLAGS=--static --enable-riscv-asm=zvkned
Digest state is not always stored in a way that can be directly copied out.
This commit is contained in:
Sean Parkinson
2025-05-03 08:41:11 +10:00
parent 1075ce8cf4
commit 3acf3ef3c5
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/port/riscv/riscv-64-sha256.c
View File

@ -965,15 +965,24 @@ int wc_Sha256FinalRaw(wc_Sha256* sha256, byte* hash)
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
} }
else { else {
#ifdef LITTLE_ENDIAN_ORDER
word32 digest[WC_SHA256_DIGEST_SIZE / sizeof(word32)]; word32 digest[WC_SHA256_DIGEST_SIZE / sizeof(word32)];
#ifndef WOLFSSL_RISCV_VECTOR_CRYPTO_ASM
ByteReverseWords((word32*)digest, (word32*)sha256->digest, ByteReverseWords((word32*)digest, (word32*)sha256->digest,
WC_SHA256_DIGEST_SIZE); WC_SHA256_DIGEST_SIZE);
XMEMCPY(hash, digest, WC_SHA256_DIGEST_SIZE);
#else #else
XMEMCPY(hash, sha256->digest, WC_SHA256_DIGEST_SIZE); /* f, e, b, a, h, g, d, c */
digest[0] = ByteReverseWord32(sha256->digest[3]);
digest[1] = ByteReverseWord32(sha256->digest[2]);
digest[2] = ByteReverseWord32(sha256->digest[7]);
digest[3] = ByteReverseWord32(sha256->digest[6]);
digest[4] = ByteReverseWord32(sha256->digest[1]);
digest[5] = ByteReverseWord32(sha256->digest[0]);
digest[6] = ByteReverseWord32(sha256->digest[5]);
digest[7] = ByteReverseWord32(sha256->digest[4]);
#endif #endif
XMEMCPY(hash, digest, WC_SHA256_DIGEST_SIZE);
} }
return ret; return ret;

26
wolfcrypt/src/port/riscv/riscv-64-sha512.c
View File

@ -1056,10 +1056,23 @@ int wc_Sha512Update(wc_Sha512* sha512, const byte* data, word32 len)
*/ */
static void Sha512FinalRaw(wc_Sha512* sha512, byte* hash, int hashLen) static void Sha512FinalRaw(wc_Sha512* sha512, byte* hash, int hashLen)
{ {
word32 digest[WC_SHA512_DIGEST_SIZE / sizeof(word32)]; word64 digest[WC_SHA512_DIGEST_SIZE / sizeof(word64)];
#ifndef WOLFSSL_RISCV_VECTOR_CRYPTO_ASM
ByteReverseWords64((word64*)digest, (word64*)sha512->digest, ByteReverseWords64((word64*)digest, (word64*)sha512->digest,
WC_SHA512_DIGEST_SIZE); WC_SHA512_DIGEST_SIZE);
#else
/* f, e, b, a, h, g, d, c */
digest[0] = ByteReverseWord64(sha512->digest[3]);
digest[1] = ByteReverseWord64(sha512->digest[2]);
digest[2] = ByteReverseWord64(sha512->digest[7]);
digest[3] = ByteReverseWord64(sha512->digest[6]);
digest[4] = ByteReverseWord64(sha512->digest[1]);
digest[5] = ByteReverseWord64(sha512->digest[0]);
digest[6] = ByteReverseWord64(sha512->digest[5]);
digest[7] = ByteReverseWord64(sha512->digest[4]);
#endif
XMEMCPY(hash, digest, hashLen); XMEMCPY(hash, digest, hashLen);
} }
@ -1588,8 +1601,19 @@ int wc_Sha384FinalRaw(wc_Sha384* sha384, byte* hash)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#ifndef WOLFSSL_RISCV_VECTOR_CRYPTO_ASM
ByteReverseWords64((word64*)digest, (word64*)sha384->digest, ByteReverseWords64((word64*)digest, (word64*)sha384->digest,
WC_SHA384_DIGEST_SIZE); WC_SHA384_DIGEST_SIZE);
#else
/* f, e, b, a, h, g, d, c */
digest[0] = ByteReverseWord64(sha384->digest[3]);
digest[1] = ByteReverseWord64(sha384->digest[2]);
digest[2] = ByteReverseWord64(sha384->digest[7]);
digest[3] = ByteReverseWord64(sha384->digest[6]);
digest[4] = ByteReverseWord64(sha384->digest[1]);
digest[5] = ByteReverseWord64(sha384->digest[0]);
#endif
XMEMCPY(hash, digest, WC_SHA384_DIGEST_SIZE); XMEMCPY(hash, digest, WC_SHA384_DIGEST_SIZE);
return 0; return 0;