WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

asn: refactoring DecryptKey to reduce stack usage: 64 bytes - pointer size moved to the heap. 

--- variable key moved to the heap (64 bytes saved)
pull/1/head
Moisés Guimarães 2014-06-26 16:39:10 -03:00
parent 40ef0c8daa
commit 96aa460d03
1 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ctaocrypt/src/asn.c
View File

@ -838,11 +838,15 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
int saltSz, int iterations, int id, byte* input, int saltSz, int iterations, int id, byte* input,
int length, int version, byte* cbcIv) int length, int version, byte* cbcIv)
{ {
byte key[MAX_KEY_SIZE]; int typeH;
int typeH; int derivedLen;
int derivedLen; int decryptionType;
int decryptionType; int ret = 0;
int ret = 0; #ifdef CYASSL_SMALL_STACK
byte* key;
#else
byte key[MAX_KEY_SIZE];
#endif
switch (id) { switch (id) {
case PBE_MD5_DES: case PBE_MD5_DES:
@ -873,6 +877,12 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
return ALGO_ID_E; return ALGO_ID_E;
} }
#ifdef CYASSL_SMALL_STACK
key = (byte*)XMALLOC(MAX_KEY_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (key == NULL)
return MEMORY_E;
#endif
if (version == PKCS5v2) if (version == PKCS5v2)
ret = PBKDF2(key, (byte*)password, passwordSz, salt, saltSz, iterations, ret = PBKDF2(key, (byte*)password, passwordSz, salt, saltSz, iterations,
derivedLen, typeH); derivedLen, typeH);
@ -883,8 +893,12 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
int i, idx = 0; int i, idx = 0;
byte unicodePasswd[MAX_UNICODE_SZ]; byte unicodePasswd[MAX_UNICODE_SZ];
if ( (passwordSz * 2 + 2) > (int)sizeof(unicodePasswd)) if ( (passwordSz * 2 + 2) > (int)sizeof(unicodePasswd)) {
#ifdef CYASSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return UNICODE_SIZE_E; return UNICODE_SIZE_E;
}
for (i = 0; i < passwordSz; i++) { for (i = 0; i < passwordSz; i++) {
unicodePasswd[idx++] = 0x00; unicodePasswd[idx++] = 0x00;
@ -900,11 +914,19 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
ret += PKCS12_PBKDF(cbcIv, unicodePasswd, idx, salt, saltSz, ret += PKCS12_PBKDF(cbcIv, unicodePasswd, idx, salt, saltSz,
iterations, 8, typeH, 2); iterations, 8, typeH, 2);
} }
else else {
#ifdef CYASSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ALGO_ID_E; return ALGO_ID_E;
}
if (ret != 0) if (ret != 0) {
#ifdef CYASSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret; return ret;
}
switch (decryptionType) { switch (decryptionType) {
#ifndef NO_DES3 #ifndef NO_DES3
@ -917,8 +939,12 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
desIv = cbcIv; desIv = cbcIv;
ret = Des_SetKey(&dec, key, desIv, DES_DECRYPTION); ret = Des_SetKey(&dec, key, desIv, DES_DECRYPTION);
if (ret != 0) if (ret != 0) {
#ifdef CYASSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret; return ret;
}
Des_CbcDecrypt(&dec, input, input, length); Des_CbcDecrypt(&dec, input, input, length);
break; break;
@ -932,11 +958,19 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
if (version == PKCS5v2 || version == PKCS12) if (version == PKCS5v2 || version == PKCS12)
desIv = cbcIv; desIv = cbcIv;
ret = Des3_SetKey(&dec, key, desIv, DES_DECRYPTION); ret = Des3_SetKey(&dec, key, desIv, DES_DECRYPTION);
if (ret != 0) if (ret != 0) {
#ifdef CYASSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret; return ret;
}
ret = Des3_CbcDecrypt(&dec, input, input, length); ret = Des3_CbcDecrypt(&dec, input, input, length);
if (ret != 0) if (ret != 0) {
#ifdef CYASSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret; return ret;
}
break; break;
} }
#endif #endif
@ -952,9 +986,16 @@ static int DecryptKey(const char* password, int passwordSz, byte* salt,
#endif #endif
default: default:
#ifdef CYASSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ALGO_ID_E; return ALGO_ID_E;
} }
#ifdef CYASSL_SMALL_STACK
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return 0; return 0;
} }