diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-02-28 10:24:47 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-02-28 10:24:47 +0100 |
| commit | b495740f2ff66550ca9395b3fda3ea32c3acb185 (patch) | |
| tree | bc0f344f047f9e60b1929bd1dc894b364c70edd3 | |
| parent | 60c62e045245f07798f61ef7f39e8ae84fd9c8e0 (diff) | |
| download | gnutls-b495740f2ff66550ca9395b3fda3ea32c3acb185.tar.gz | |
changes in packet parsing.
| -rw-r--r-- | lib/gnutls_cipher.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c index 04d11f8636..618aab29b3 100644 --- a/lib/gnutls_cipher.c +++ b/lib/gnutls_cipher.c @@ -354,7 +354,7 @@ compressed_to_ciphertext (gnutls_session_t session, ret = _gnutls_rnd (GNUTLS_RND_NONCE, data_ptr, blocksize); if (ret < 0) return gnutls_assert_val(ret); - + _gnutls_auth_cipher_setiv(¶ms->write.cipher_state, data_ptr, blocksize); data_ptr += blocksize; @@ -509,7 +509,7 @@ ciphertext_to_compressed (gnutls_session_t session, break; case CIPHER_BLOCK: - if (ciphertext->size < MAX(blocksize, tag_size) || (ciphertext->size % blocksize != 0)) + if (ciphertext->size < blocksize || (ciphertext->size % blocksize != 0)) return gnutls_assert_val(GNUTLS_E_UNEXPECTED_PACKET_LENGTH); /* ignore the IV in TLS 1.1+ @@ -521,14 +521,11 @@ ciphertext_to_compressed (gnutls_session_t session, ciphertext->size -= blocksize; ciphertext->data += blocksize; - - if (ciphertext->size == 0) - { - gnutls_assert (); - return GNUTLS_E_DECRYPTION_FAILED; - } } + if (ciphertext->size < tag_size) + return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); + /* we don't use the auth_cipher interface here, since * TLS with block ciphers is impossible to be used under such * an API. (the length of plaintext is required to calculate @@ -541,6 +538,7 @@ ciphertext_to_compressed (gnutls_session_t session, pad = ciphertext->data[ciphertext->size - 1] + 1; /* pad */ + if ((int) pad > (int) ciphertext->size - tag_size) { gnutls_assert (); |