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

Merge pull request #5788 from dgarske/small_build

Browse Source 
Fix for misc `HashObject` to be excluded for `WOLFCRYPT_ONLY`
This commit is contained in:
JacobBarthelmeh
2022-11-10 16:03:25 -07:00
committed by GitHub
parent f4621a6807 77ffacf6d1
commit 7887576032
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/misc.c
View File

@@ -834,7 +834,7 @@ WC_STATIC WC_INLINE word32 MakeWordFromHash(const byte* hashID)
#endif /* HAVE_SESSION_TICKET || !NO_CERTS || !NO_SESSION_CACHE */
#if !defined(NO_SESSION_CACHE) || defined(HAVE_SESSION_TICKET)
#if !defined(WOLFCRYPT_ONLY) && (!defined(NO_SESSION_CACHE) || defined(HAVE_SESSION_TICKET))
#include <wolfssl/wolfcrypt/hash.h>
@@ -855,7 +855,7 @@ WC_STATIC WC_INLINE word32 HashObject(const byte* o, word32 len, int* error)
return *error == 0 ? MakeWordFromHash(digest) : 0; /* 0 on failure */
}
#endif /* !NO_SESSION_CACHE || HAVE_SESSION_TICKET */
#endif /* WOLFCRYPT_ONLY && (!NO_SESSION_CACHE || HAVE_SESSION_TICKET) */
#undef WC_STATIC

11
wolfcrypt/src/wc_encrypt.c
View File

@@ -422,20 +422,25 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
typeH = WC_SHA;
derivedLen = 16; /* may need iv for v1.5 */
break;
#endif /* !NO_SHA */
#if !defined(NO_SHA) || !defined(NO_SHA256)
case PBE_SHA1_DES3:
switch(shaOid) {
switch (shaOid) {
#ifndef NO_SHA256
case HMAC_SHA256_OID:
typeH = WC_SHA256;
derivedLen = 32;
break;
#endif
#ifndef NO_SHA
default:
typeH = WC_SHA;
derivedLen = 32; /* may need iv for v1.5 */
break;
#endif
}
break;
#endif /* !NO_SHA */
#endif
#endif /* !NO_DES3 */
#if !defined(NO_SHA) && !defined(NO_RC4)
case PBE_SHA1_RC4_128: