| Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 1 | From 6f868bbcd9e65447f459f74381c09d1e315a32f6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jakub Jelen <jjelen@redhat.com> |
| 3 | Date: Thu, 1 Dec 2022 20:08:53 +0100 |
| 4 | Subject: [PATCH 1/2] pkcs11-tool: Fix private key import |
| 5 | |
| 6 | Upstream-Status: Backport |
| 7 | --- |
| 8 | src/tools/pkcs11-tool.c | 4 ++-- |
| 9 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 10 | |
| 11 | diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c |
| 12 | index aae205fe2cd6..cfee8526d5b0 100644 |
| 13 | --- a/src/tools/pkcs11-tool.c |
| 14 | +++ b/src/tools/pkcs11-tool.c |
| 15 | @@ -3669,13 +3669,13 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) |
| 16 | RSA_get0_factors(r, &r_p, &r_q); |
| 17 | RSA_get0_crt_params(r, &r_dmp1, &r_dmq1, &r_iqmp); |
| 18 | #else |
| 19 | - if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_d) != 1 || |
| 20 | + if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, &r_d) != 1 || |
| 21 | EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_p) != 1 || |
| 22 | EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || |
| 23 | EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || |
| 24 | EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || |
| 25 | - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT3, &r_iqmp) != 1) { |
| 26 | util_fatal("OpenSSL error during RSA private key parsing"); |
| 27 | + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { |
| 28 | } |
| 29 | #endif |
| 30 | RSA_GET_BN(rsa, private_exponent, r_d); |
| 31 | -- |
| 32 | 2.30.2 |
| 33 | |