PKCS#7 decrypt_data: merge all errors during decryption to GNUTLS_E_DECRYPTION_FAILED

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 7f0b886cf9..4d4772f737 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1698,7 +1698,7 @@ decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn,
 
 	if (ce->block && (data_size % block_size != 0)) {
 		gnutls_assert();
-		result = GNUTLS_E_ILLEGAL_PARAMETER;
+		result = GNUTLS_E_DECRYPTION_FAILED;
 		goto error;
 	}
 
@@ -1717,6 +1717,7 @@ decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn,
 
 	if (result < 0) {
 		gnutls_assert();
+		result = GNUTLS_E_DECRYPTION_FAILED;
 		goto error;
 	}
 
@@ -1733,7 +1734,7 @@ decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn,
 	if (block_size != 1) {
 		if (data[data_size - 1] >= data_size) {
 			gnutls_assert();
-			result = GNUTLS_E_ILLEGAL_PARAMETER;
+			result = GNUTLS_E_DECRYPTION_FAILED;
 			goto error;
 		}