diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-12-14 10:44:22 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-12-14 10:44:22 +0100 |
| commit | 2c0448610ee69b18f65aef5f65e68083e0e18e08 (patch) | |
| tree | bcc48cf65a4912fe0adb6f03ce7f7f111300d4bb | |
| parent | 77a832fbf92544eb688043643fa897ca09337728 (diff) | |
| download | gnutls-2c0448610ee69b18f65aef5f65e68083e0e18e08.tar.gz | |
PKCS#5,7 decryption: added sanity check on padding size
Relates #148
| -rw-r--r-- | lib/x509/privkey_pkcs8.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c index d560a4b44c..27370bea35 100644 --- a/lib/x509/privkey_pkcs8.c +++ b/lib/x509/privkey_pkcs8.c @@ -1940,9 +1940,15 @@ decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn, decrypted_data->data = enc.data; - if (block_size != 1) + if (block_size != 1) { + if (enc.data[enc.size - 1] >= enc.size) { + gnutls_assert(); + result = GNUTLS_E_ILLEGAL_PARAMETER; + goto error; + } + decrypted_data->size = enc.size - enc.data[enc.size - 1]; - else + } else decrypted_data->size = enc.size; _gnutls_cipher_deinit(&ch); |