I am uploading a NMU to DELAYED/10 with the attached debdiff.
diff -Nru opensc-0.23.0/debian/changelog opensc-0.23.0/debian/changelog
--- opensc-0.23.0/debian/changelog      2023-01-10 18:00:21.000000000 +0100
+++ opensc-0.23.0/debian/changelog      2023-02-13 17:13:20.000000000 +0100
@@ -1,3 +1,10 @@
+opensc (0.23.0-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Fix rauc build (Closes: #1030434)
+
+ -- Bastian Germann <b...@debian.org>  Mon, 13 Feb 2023 17:13:20 +0100
+
 opensc (0.23.0-0.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru opensc-0.23.0/debian/patches/0002-Fix-private-key-import.patch 
opensc-0.23.0/debian/patches/0002-Fix-private-key-import.patch
--- opensc-0.23.0/debian/patches/0002-Fix-private-key-import.patch      
1970-01-01 01:00:00.000000000 +0100
+++ opensc-0.23.0/debian/patches/0002-Fix-private-key-import.patch      
2023-02-13 16:52:41.000000000 +0100
@@ -0,0 +1,29 @@
+Origin: upstream, 9294183e07ff4944e3f5e590f343f5727636767e
+From: Jakub Jelen <jje...@redhat.com>
+Date: Thu, 1 Dec 2022 20:08:53 +0100
+Subject: pkcs11-tool: Fix private key import
+
+---
+ 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 aae205fe2c..cfee8526d5 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);
diff -Nru opensc-0.23.0/debian/patches/0003-Log-OpenSSL-errors.patch 
opensc-0.23.0/debian/patches/0003-Log-OpenSSL-errors.patch
--- opensc-0.23.0/debian/patches/0003-Log-OpenSSL-errors.patch  1970-01-01 
01:00:00.000000000 +0100
+++ opensc-0.23.0/debian/patches/0003-Log-OpenSSL-errors.patch  2023-02-13 
16:51:41.000000000 +0100
@@ -0,0 +1,50 @@
+Origin: upstream, cff91cf6167743bdd59285150c4ef19802ed2644
+From: Jakub Jelen <jje...@redhat.com>
+Date: Thu, 1 Dec 2022 20:11:41 +0100
+Subject: pkcs11-tool: Log more information on OpenSSL errors
+
+---
+ src/tools/pkcs11-tool.c | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c
+index cfee8526d5..f2e6b1dd91 100644
+--- a/src/tools/pkcs11-tool.c
++++ b/src/tools/pkcs11-tool.c
+@@ -3641,10 +3641,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct 
rsakey_info *rsa)
+       const BIGNUM *r_dmp1, *r_dmq1, *r_iqmp;
+       r = EVP_PKEY_get1_RSA(pkey);
+       if (!r) {
+-              if (private)
+-                      util_fatal("OpenSSL error during RSA private key 
parsing");
+-              else
+-                      util_fatal("OpenSSL error during RSA public key 
parsing");
++              util_fatal("OpenSSL error during RSA %s key parsing: %s", 
private ? "private" : "public",
++                      ERR_error_string(ERR_peek_last_error(), NULL));
+       }
+ 
+       RSA_get0_key(r, &r_n, &r_e, NULL);
+@@ -3654,10 +3652,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct 
rsakey_info *rsa)
+       BIGNUM *r_dmp1 = NULL, *r_dmq1 = NULL, *r_iqmp = NULL;
+       if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &r_n) != 1 ||
+               EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &r_e) != 1) {
+-              if (private)
+-                      util_fatal("OpenSSL error during RSA private key 
parsing");
+-              else
+-                      util_fatal("OpenSSL error during RSA public key 
parsing");
++              util_fatal("OpenSSL error during RSA %s key parsing: %s", 
private ? "private" : "public",
++                      ERR_error_string(ERR_peek_last_error(), NULL));
+        }
+ #endif
+       RSA_GET_BN(rsa, modulus, r_n);
+@@ -3674,8 +3670,9 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct 
rsakey_info *rsa)
+                       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 ||
+-                      util_fatal("OpenSSL error during RSA private key 
parsing");
+                       EVP_PKEY_get_bn_param(pkey, 
OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) {
++                      util_fatal("OpenSSL error during RSA private key 
parsing: %s",
++                              ERR_error_string(ERR_peek_last_error(), NULL));
+               }
+ #endif
+               RSA_GET_BN(rsa, private_exponent, r_d);
diff -Nru opensc-0.23.0/debian/patches/series 
opensc-0.23.0/debian/patches/series
--- opensc-0.23.0/debian/patches/series 2023-01-10 17:57:32.000000000 +0100
+++ opensc-0.23.0/debian/patches/series 2023-02-13 17:13:04.000000000 +0100
@@ -1 +1,3 @@
 0001-Use-sysconfdir-opensc-for-opensc.conf.patch
+0002-Fix-private-key-import.patch
+0003-Log-OpenSSL-errors.patch

Reply via email to