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

don't allow corrupted change cipher (fix by antoxa), don't allow multiple decryptions of corrupted messages

pull/1/head
toddouska 2012-09-04 11:37:47 -07:00
parent 2bee126062
commit 1ba8aff525
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cyassl/internal.h
View File

@ -965,6 +965,7 @@ typedef struct Keys {
word32 encryptSz; /* last size of encrypted data */ word32 encryptSz; /* last size of encrypted data */
byte encryptionOn; /* true after change cipher spec */ byte encryptionOn; /* true after change cipher spec */
byte decryptedCur; /* only decrypt current record once */
} Keys; } Keys;

15
src/internal.c
View File

@ -926,6 +926,7 @@ int InitSSL(CYASSL* ssl, CYASSL_CTX* ctx)
ssl->arrays.cookieSz = 0; ssl->arrays.cookieSz = 0;
#endif #endif
ssl->keys.encryptionOn = 0; /* initially off */ ssl->keys.encryptionOn = 0; /* initially off */
ssl->keys.decryptedCur = 0; /* initially off */
ssl->options.sessionCacheOff = ctx->sessionCacheOff; ssl->options.sessionCacheOff = ctx->sessionCacheOff;
ssl->options.sessionCacheFlushOff = ctx->sessionCacheFlushOff; ssl->options.sessionCacheFlushOff = ctx->sessionCacheFlushOff;
@ -1578,6 +1579,9 @@ static int GetRecordHeader(CYASSL* ssl, const byte* input, word32* inOutIdx,
return UNKNOWN_RECORD_TYPE; return UNKNOWN_RECORD_TYPE;
} }
/* haven't decrypted this record yet */
ssl->keys.decryptedCur = 0;
return 0; return 0;
} }
@ -2508,7 +2512,9 @@ static int DecryptMessage(CYASSL* ssl, byte* input, word32 sz, word32* idx)
if (decryptResult == 0) if (decryptResult == 0)
{ {
ssl->keys.encryptSz = sz; ssl->keys.encryptSz = sz;
ssl->keys.decryptedCur = 1;
if (ssl->options.tls1_1 && ssl->specs.cipher_type == block) if (ssl->options.tls1_1 && ssl->specs.cipher_type == block)
*idx += ssl->specs.block_size; /* go past TLSv1.1 IV */ *idx += ssl->specs.block_size; /* go past TLSv1.1 IV */
if (ssl->specs.cipher_type == aead) if (ssl->specs.cipher_type == aead)
@ -2852,7 +2858,7 @@ int ProcessReply(CYASSL* ssl)
/* the record layer is here */ /* the record layer is here */
case runProcessingOneMessage: case runProcessingOneMessage:
if (ssl->keys.encryptionOn) if (ssl->keys.encryptionOn && ssl->keys.decryptedCur == 0)
if (DecryptMessage(ssl, ssl->buffers.inputBuffer.buffer + if (DecryptMessage(ssl, ssl->buffers.inputBuffer.buffer +
ssl->buffers.inputBuffer.idx, ssl->buffers.inputBuffer.idx,
ssl->curSize, ssl->curSize,
@ -2896,6 +2902,11 @@ int ProcessReply(CYASSL* ssl)
AddLateRecordHeader(&ssl->curRL, &ssl->timeoutInfo); AddLateRecordHeader(&ssl->curRL, &ssl->timeoutInfo);
} }
#endif #endif
if (ssl->curSize != 1) {
CYASSL_MSG("Malicious or corrupted ChangeCipher msg");
return LENGTH_ERROR;
}
ssl->buffers.inputBuffer.idx++; ssl->buffers.inputBuffer.idx++;
ssl->keys.encryptionOn = 1; ssl->keys.encryptionOn = 1;