diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-01-02 11:51:10 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-01-02 11:58:15 +0100 |
| commit | bbaf1475c3a8034cbb3773ab9acc3e71e4a6e793 (patch) | |
| tree | ea62b628964c1e3d29d2eb020c85464e494aa57c | |
| parent | f231a3bf9c2bc7acefc291139e1348110d1ee390 (diff) | |
| download | gnutls-tmp-fix-pkcs8-decryption-issue.tar.gz | |
pkcs7 decrypt: require a valid IV size on all cipherstmp-fix-pkcs8-decryption-issue
That is, do not accept the IV size present in the structure as valid
without checking.
Relates #156
| -rw-r--r-- | lib/x509/pkcs7-crypt.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/x509/pkcs7-crypt.c b/lib/x509/pkcs7-crypt.c index 968775657e..e62500c84d 100644 --- a/lib/x509/pkcs7-crypt.c +++ b/lib/x509/pkcs7-crypt.c @@ -1091,10 +1091,19 @@ _gnutls_pkcs_raw_decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn, ce = cipher_to_entry(enc_params->cipher); block_size = _gnutls_cipher_get_block_size(ce); - if (ce->type == CIPHER_BLOCK && (enc.size % block_size != 0)) { - gnutls_assert(); - ret = GNUTLS_E_DECRYPTION_FAILED; - goto error; + if (ce->type == CIPHER_BLOCK) { + if (enc.size % block_size != 0 || (unsigned)enc_params->iv_size != block_size) { + gnutls_assert(); + ret = GNUTLS_E_DECRYPTION_FAILED; + goto error; + } + } else { + unsigned iv_size = _gnutls_cipher_get_iv_size(ce); + if (iv_size > (unsigned)enc_params->iv_size) { + gnutls_assert(); + ret = GNUTLS_E_DECRYPTION_FAILED; + goto error; + } } /* do the decryption. |