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

delay peer RSA key alloc/init until needed

Browse Source
This commit is contained in:
toddouska
2015-03-05 12:38:34 -08:00
parent 818d5c4bf3
commit 450ccea7ee
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/internal.c
View File

@ -1875,17 +1875,6 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
} }
*ssl->suites = ctx->suites; *ssl->suites = ctx->suites;
/* peer key */
#ifndef NO_RSA
ssl->peerRsaKey = (RsaKey*)XMALLOC(sizeof(RsaKey), ssl->heap,
DYNAMIC_TYPE_RSA);
if (ssl->peerRsaKey == NULL) {
WOLFSSL_MSG("PeerRsaKey Memory error");
return MEMORY_E;
}
ret = wc_InitRsaKey(ssl->peerRsaKey, ctx->heap);
if (ret != 0) return ret;
#endif
#ifndef NO_CERTS #ifndef NO_CERTS
/* make sure server has cert and key unless using PSK or Anon */ /* make sure server has cert and key unless using PSK or Anon */
if (ssl->options.side == WOLFSSL_SERVER_END && !havePSK && !haveAnon) if (ssl->options.side == WOLFSSL_SERVER_END && !havePSK && !haveAnon)
@ -4370,7 +4359,18 @@ static int DoCertificate(WOLFSSL* ssl, byte* input, word32* inOutIdx,
word32 idx = 0; word32 idx = 0;
int keyRet = 0; int keyRet = 0;
if (ssl->peerRsaKeyPresent) { /* don't leak on reuse */ if (ssl->peerRsaKey == NULL) {
ssl->peerRsaKey = (RsaKey*)XMALLOC(sizeof(RsaKey),
ssl->heap, DYNAMIC_TYPE_RSA);
if (ssl->peerRsaKey == NULL) {
WOLFSSL_MSG("PeerRsaKey Memory error");
keyRet = MEMORY_E;
} else {
keyRet = wc_InitRsaKey(ssl->peerRsaKey,
ssl->ctx->heap);
}
} else if (ssl->peerRsaKeyPresent) {
/* don't leak on reuse */
wc_FreeRsaKey(ssl->peerRsaKey); wc_FreeRsaKey(ssl->peerRsaKey);
ssl->peerRsaKeyPresent = 0; ssl->peerRsaKeyPresent = 0;
keyRet = wc_InitRsaKey(ssl->peerRsaKey, ssl->heap); keyRet = wc_InitRsaKey(ssl->peerRsaKey, ssl->heap);
@ -10140,7 +10140,7 @@ static void PickHashSigAlgo(WOLFSSL* ssl,
doUserRsa = 1; doUserRsa = 1;
#endif /*HAVE_PK_CALLBACKS */ #endif /*HAVE_PK_CALLBACKS */
if (!ssl->peerRsaKeyPresent) if (ssl->peerRsaKey == NULL || !ssl->peerRsaKeyPresent)
ERROR_OUT(NO_PEER_KEY, done); ERROR_OUT(NO_PEER_KEY, done);
if (doUserRsa) { if (doUserRsa) {
@ -10364,7 +10364,7 @@ static void PickHashSigAlgo(WOLFSSL* ssl,
ssl->arrays->preMasterSecret[1] = ssl->chVersion.minor; ssl->arrays->preMasterSecret[1] = ssl->chVersion.minor;
ssl->arrays->preMasterSz = SECRET_LEN; ssl->arrays->preMasterSz = SECRET_LEN;
if (ssl->peerRsaKeyPresent == 0) { if (ssl->peerRsaKey == NULL || ssl->peerRsaKeyPresent == 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(encSecret, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(encSecret, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
@ -13067,7 +13067,7 @@ int DoSessionTicket(WOLFSSL* ssl,
/* RSA */ /* RSA */
#ifndef NO_RSA #ifndef NO_RSA
if (ssl->peerRsaKeyPresent != 0) { if (ssl->peerRsaKey != NULL && ssl->peerRsaKeyPresent != 0) {
byte* out = NULL; byte* out = NULL;
int outLen = 0; int outLen = 0;
byte doUserRsa = 0; byte doUserRsa = 0;