| From 6f868bbcd9e65447f459f74381c09d1e315a32f6 Mon Sep 17 00:00:00 2001 |
| From: Jakub Jelen <jjelen@redhat.com> |
| Date: Thu, 1 Dec 2022 20:08:53 +0100 |
| Subject: [PATCH 1/2] pkcs11-tool: Fix private key import |
| |
| Upstream-Status: Backport |
| --- |
| src/tools/pkcs11-tool.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c |
| index aae205fe2cd6..cfee8526d5b0 100644 |
| --- a/src/tools/pkcs11-tool.c |
| +++ b/src/tools/pkcs11-tool.c |
| @@ -3669,13 +3669,13 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) |
| RSA_get0_factors(r, &r_p, &r_q); |
| RSA_get0_crt_params(r, &r_dmp1, &r_dmq1, &r_iqmp); |
| #else |
| - if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_d) != 1 || |
| + if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, &r_d) != 1 || |
| EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_p) != 1 || |
| EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || |
| EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || |
| EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || |
| - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT3, &r_iqmp) != 1) { |
| util_fatal("OpenSSL error during RSA private key parsing"); |
| + EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { |
| } |
| #endif |
| RSA_GET_BN(rsa, private_exponent, r_d); |
| -- |
| 2.30.2 |
| |