| Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 1 | From 4b5702409e7feea8cb410254285c120c57c10e1b Mon Sep 17 00:00:00 2001 |
| 2 | From: Jakub Jelen <jjelen@redhat.com> |
| 3 | Date: Thu, 1 Dec 2022 20:11:41 +0100 |
| 4 | Subject: [PATCH 2/2] pkcs11-tool: Log more information on OpenSSL errors |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | --- |
| 8 | src/tools/pkcs11-tool.c | 15 ++++++--------- |
| 9 | 1 file changed, 6 insertions(+), 9 deletions(-) |
| 10 | |
| 11 | diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c |
| 12 | index cfee8526d5b0..f2e6b1dd91cd 100644 |
| 13 | --- a/src/tools/pkcs11-tool.c |
| 14 | +++ b/src/tools/pkcs11-tool.c |
| 15 | @@ -3641,10 +3641,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) |
| 16 | const BIGNUM *r_dmp1, *r_dmq1, *r_iqmp; |
| 17 | r = EVP_PKEY_get1_RSA(pkey); |
| 18 | if (!r) { |
| 19 | - if (private) |
| 20 | - util_fatal("OpenSSL error during RSA private key parsing"); |
| 21 | - else |
| 22 | - util_fatal("OpenSSL error during RSA public key parsing"); |
| 23 | + util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", |
| 24 | + ERR_error_string(ERR_peek_last_error(), NULL)); |
| 25 | } |
| 26 | |
| 27 | RSA_get0_key(r, &r_n, &r_e, NULL); |
| 28 | @@ -3654,10 +3652,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) |
| 29 | BIGNUM *r_dmp1 = NULL, *r_dmq1 = NULL, *r_iqmp = NULL; |
| 30 | if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &r_n) != 1 || |
| 31 | EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &r_e) != 1) { |
| 32 | - if (private) |
| 33 | - util_fatal("OpenSSL error during RSA private key parsing"); |
| 34 | - else |
| 35 | - util_fatal("OpenSSL error during RSA public key parsing"); |
| 36 | + util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", |
| 37 | + ERR_error_string(ERR_peek_last_error(), NULL)); |
| 38 | } |
| 39 | #endif |
| 40 | RSA_GET_BN(rsa, modulus, r_n); |
| 41 | @@ -3674,8 +3670,9 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) |
| 42 | EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || |
| 43 | EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || |
| 44 | EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || |
| 45 | - util_fatal("OpenSSL error during RSA private key parsing"); |
| 46 | EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { |
| 47 | + util_fatal("OpenSSL error during RSA private key parsing: %s", |
| 48 | + ERR_error_string(ERR_peek_last_error(), NULL)); |
| 49 | } |
| 50 | #endif |
| 51 | RSA_GET_BN(rsa, private_exponent, r_d); |
| 52 | -- |
| 53 | 2.30.2 |
| 54 | |