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

Fix to PIC32MZ handling of hashing empty string. Changed default MPLABX/MCAPI user_settings.h to use 2048-bit. All tests passed!

Browse Source
This commit is contained in:
David Garske
2017-08-21 15:19:18 -07:00
parent 075adcb15b
commit 07d137480d
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mcapi/user_settings.h
View File

@ -112,13 +112,13 @@ extern "C" {
#ifdef USE_FAST_MATH #ifdef USE_FAST_MATH
/* Maximum math bits (Max RSA key bits * 2) */ /* Maximum math bits (Max RSA key bits * 2) */
#undef FP_MAX_BITS #undef FP_MAX_BITS
#define FP_MAX_BITS 2048 #define FP_MAX_BITS 4096
#endif #endif
/* half as much memory but twice as slow */ /* half as much memory but twice as slow */
#undef RSA_LOW_MEM #undef RSA_LOW_MEM
//#define RSA_LOW_MEM //#define RSA_LOW_MEM
/* timing resistance */ /* timing resistance */
#undef WC_RSA_BLINDING #undef WC_RSA_BLINDING
#define WC_RSA_BLINDING #define WC_RSA_BLINDING
@ -237,10 +237,10 @@ extern "C" {
#define BENCH_EMBEDDED #define BENCH_EMBEDDED
#undef USE_CERT_BUFFERS_2048 #undef USE_CERT_BUFFERS_2048
//#define USE_CERT_BUFFERS_2048 #define USE_CERT_BUFFERS_2048
#undef USE_CERT_BUFFERS_1024 #undef USE_CERT_BUFFERS_1024
#define USE_CERT_BUFFERS_1024 //#define USE_CERT_BUFFERS_1024
#undef USE_CERT_BUFFERS_256 #undef USE_CERT_BUFFERS_256
#define USE_CERT_BUFFERS_256 #define USE_CERT_BUFFERS_256

8
mplabx/user_settings.h
View File

@ -112,13 +112,13 @@ extern "C" {
#ifdef USE_FAST_MATH #ifdef USE_FAST_MATH
/* Maximum math bits (Max RSA key bits * 2) */ /* Maximum math bits (Max RSA key bits * 2) */
#undef FP_MAX_BITS #undef FP_MAX_BITS
#define FP_MAX_BITS 2048 #define FP_MAX_BITS 4096
#endif #endif
/* half as much memory but twice as slow */ /* half as much memory but twice as slow */
#undef RSA_LOW_MEM #undef RSA_LOW_MEM
//#define RSA_LOW_MEM //#define RSA_LOW_MEM
/* timing resistance */ /* timing resistance */
#undef WC_RSA_BLINDING #undef WC_RSA_BLINDING
#define WC_RSA_BLINDING #define WC_RSA_BLINDING
@ -237,10 +237,10 @@ extern "C" {
#define BENCH_EMBEDDED #define BENCH_EMBEDDED
#undef USE_CERT_BUFFERS_2048 #undef USE_CERT_BUFFERS_2048
//#define USE_CERT_BUFFERS_2048 #define USE_CERT_BUFFERS_2048
#undef USE_CERT_BUFFERS_1024 #undef USE_CERT_BUFFERS_1024
#define USE_CERT_BUFFERS_1024 //#define USE_CERT_BUFFERS_1024
#undef USE_CERT_BUFFERS_256 #undef USE_CERT_BUFFERS_256
#define USE_CERT_BUFFERS_256 #define USE_CERT_BUFFERS_256

38
wolfcrypt/src/port/pic32/pic32mz-crypt.c
View File

@ -192,7 +192,7 @@ static int Pic32Crypto(const byte* in, int inLen, word32* out, int outLen,
/* Software Reset the Crypto Engine */ /* Software Reset the Crypto Engine */
CECON = 1 << 6; CECON = 1 << 6;
while (CECON); while (CECON);
/* Clear the interrupt flags */ /* Clear the interrupt flags */
CEINTSRC = 0xF; CEINTSRC = 0xF;
@ -551,10 +551,40 @@ static int wc_Pic32HashFinal(hashUpdCache* cache, byte* stdBuf,
else else
#endif #endif
{ {
ret = wc_Pic32Hash(cache->buf, cache->updLen, digest, digestSz, algo); if (cache->updLen == 0) {
if (ret == 0) { /* handle empty input */
XMEMCPY(hash, digest, digestSz); switch (algo) {
case PIC32_ALGO_SHA256: {
const char* sha256EmptyHash =
"\xe3\xb0\xc4\x42\x98\xfc\x1c\x14\x9a\xfb\xf4\xc8\x99\x6f\xb9"
"\x24\x27\xae\x41\xe4\x64\x9b\x93\x4c\xa4\x95\x99\x1b\x78\x52"
"\xb8\x55";
XMEMCPY(hash, sha256EmptyHash, digestSz);
break;
}
case PIC32_ALGO_SHA1: {
const char* shaEmptyHash =
"\xda\x39\xa3\xee\x5e\x6b\x4b\x0d\x32\x55\xbf\xef\x95\x60\x18"
"\x90\xaf\xd8\x07\x09";
XMEMCPY(hash, shaEmptyHash, digestSz);
break;
}
case PIC32_ALGO_MD5: {
const char* md5EmptyHash =
"\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04\xe9\x80\x09\x98\xec\xf8\x42"
"\x7e";
XMEMCPY(hash, md5EmptyHash, digestSz);
break;
}
} /* switch */
} }
else {
ret = wc_Pic32Hash(cache->buf, cache->updLen, digest, digestSz, algo);
if (ret == 0) {
XMEMCPY(hash, digest, digestSz);
}
}
if (cache->buf && cache->buf != stdBuf && !cache->isCopy) { if (cache->buf && cache->buf != stdBuf && !cache->isCopy) {
XFREE(cache->buf, heap, DYNAMIC_TYPE_HASH_TMP); XFREE(cache->buf, heap, DYNAMIC_TYPE_HASH_TMP);
} }