Skip to content

Commit a1dd7da

Browse files
authored
Merge pull request wolfSSL#9095 from miyazakh/add_sha512_typeproperty
Add hashtype property to wc_Sha512 structure
2 parents 102525c + b67e063 commit a1dd7da

3 files changed

Lines changed: 13 additions & 0 deletions

File tree

.wolfssl_known_macro_extras

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,7 @@ WOLFSSL_SERVER_EXAMPLE
844844
WOLFSSL_SETTINGS_FILE
845845
WOLFSSL_SH224
846846
WOLFSSL_SHA256_ALT_CH_MAJ
847+
WOLFSSL_SHA512_HASHTYPE
847848
WOLFSSL_SHUTDOWNONCE
848849
WOLFSSL_SILABS_TRNG
849850
WOLFSSL_SM4_EBC

wolfcrypt/src/sha512.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,9 @@ static int InitSha512(wc_Sha512* sha512)
325325
#ifdef WOLFSSL_HASH_FLAGS
326326
sha512->flags = 0;
327327
#endif
328+
#if defined(WOLFSSL_SHA512_HASHTYPE)
329+
sha512->hashType = WC_HASH_TYPE_SHA512;
330+
#endif /* WOLFSSL_SHA512_HASHTYPE */
328331
return 0;
329332
}
330333

@@ -378,6 +381,9 @@ static int InitSha512_224(wc_Sha512* sha512)
378381
#ifdef WOLFSSL_HASH_FLAGS
379382
sha512->flags = 0;
380383
#endif
384+
#if defined(WOLFSSL_SHA512_HASHTYPE)
385+
sha512->hashType = WC_HASH_TYPE_SHA512_224;
386+
#endif /* WOLFSSL_SHA512_HASHTYPE */
381387
return 0;
382388
}
383389
#endif /* !WOLFSSL_NOSHA512_224 && !FIPS ... */
@@ -431,6 +437,9 @@ static int InitSha512_256(wc_Sha512* sha512)
431437
#ifdef WOLFSSL_HASH_FLAGS
432438
sha512->flags = 0;
433439
#endif
440+
#if defined(WOLFSSL_SHA512_HASHTYPE)
441+
sha512->hashType = WC_HASH_TYPE_SHA512_256;
442+
#endif /* WOLFSSL_SHA512_HASHTYPE */
434443
return 0;
435444
}
436445
#endif /* !WOLFSSL_NOSHA512_256 && !FIPS... */

wolfssl/wolfcrypt/sha512.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,9 @@ struct wc_Sha512 {
209209
#if defined(STM32_HASH_SHA512)
210210
STM32_HASH_Context stmCtx;
211211
#endif
212+
#if defined(WOLFSSL_SHA512_HASHTYPE)
213+
int hashType; /* used to determine which SHA512 is used */
214+
#endif /* WOLFSSL_SHA512_HASHTYPE */
212215
#endif /* WOLFSSL_PSOC6_CRYPTO */
213216
};
214217

0 commit comments

Comments
 (0)