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

asn: refactoring GetKey to reduce stack usage: 610 bytes - pointers size moved to the heap.

Browse Source 
--- variable keyBlob moved to the heap (610 bytes saved)
This commit is contained in:
Moisés Guimarães
2014-06-27 10:19:52 -03:00
parent 8c1a4a4944
commit e077cd067b
1 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ctaocrypt/src/asn.c
View File

@ -1664,35 +1664,62 @@ static int GetKey(DecodedCert* cert)
const byte* key = &cert->source[tmpIdx]; const byte* key = &cert->source[tmpIdx];
byte* next = (byte*)key; byte* next = (byte*)key;
word16 keyLen; word16 keyLen;
byte keyBlob[MAX_NTRU_KEY_SZ];
word32 rc; word32 rc;
#ifdef CYASSL_SMALL_STACK
byte* keyBlob = NULL;
#else
byte keyBlob[MAX_NTRU_KEY_SZ];
#endif
rc = ntru_crypto_ntru_encrypt_subjectPublicKeyInfo2PublicKey(key, rc = ntru_crypto_ntru_encrypt_subjectPublicKeyInfo2PublicKey(key,
&keyLen, NULL, &next); &keyLen, NULL, &next);
if (rc != NTRU_OK) if (rc != NTRU_OK)
return ASN_NTRU_KEY_E; return ASN_NTRU_KEY_E;
if (keyLen > sizeof(keyBlob)) if (keyLen > MAX_NTRU_KEY_SZ)
return ASN_NTRU_KEY_E; return ASN_NTRU_KEY_E;
#ifdef CYASSL_SMALL_STACK
keyBlob = (byte*)XMALLOC(MAX_NTRU_KEY_SZ, NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (keyBlob == NULL)
return MEMORY_E;
#endif
rc = ntru_crypto_ntru_encrypt_subjectPublicKeyInfo2PublicKey(key, rc = ntru_crypto_ntru_encrypt_subjectPublicKeyInfo2PublicKey(key,
&keyLen, keyBlob, &next); &keyLen, keyBlob, &next);
if (rc != NTRU_OK) if (rc != NTRU_OK) {
#ifdef CYASSL_SMALL_STACK
XFREE(keyBlob, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ASN_NTRU_KEY_E; return ASN_NTRU_KEY_E;
}
if ( (next - key) < 0) if ( (next - key) < 0) {
#ifdef CYASSL_SMALL_STACK
XFREE(keyBlob, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ASN_NTRU_KEY_E; return ASN_NTRU_KEY_E;
}
cert->srcIdx = tmpIdx + (int)(next - key); cert->srcIdx = tmpIdx + (int)(next - key);
cert->publicKey = (byte*) XMALLOC(keyLen, cert->heap, cert->publicKey = (byte*) XMALLOC(keyLen, cert->heap,
DYNAMIC_TYPE_PUBLIC_KEY); DYNAMIC_TYPE_PUBLIC_KEY);
if (cert->publicKey == NULL) if (cert->publicKey == NULL) {
#ifdef CYASSL_SMALL_STACK
XFREE(keyBlob, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return MEMORY_E; return MEMORY_E;
}
XMEMCPY(cert->publicKey, keyBlob, keyLen); XMEMCPY(cert->publicKey, keyBlob, keyLen);
cert->pubKeyStored = 1; cert->pubKeyStored = 1;
cert->pubKeySize = keyLen; cert->pubKeySize = keyLen;
#ifdef CYASSL_SMALL_STACK
XFREE(keyBlob, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return 0; return 0;
} }
#endif /* HAVE_NTRU */ #endif /* HAVE_NTRU */