[gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/, dev-libs/opensc/files/

2024-03-07 Thread David Seifert 
commit: a85b54e12c203e216d4d231a54c0d4f142b1da39
Author: David Seifert  gentoo  org>
AuthorDate: Thu Mar  7 09:25:48 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Mar  7 09:25:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85b54e1

dev-libs/opensc: drop 0.23.0-r3

Signed-off-by: David Seifert  gentoo.org>

 dev-libs/opensc/Manifest   |   1 -
 .../opensc/files/opensc-0.23.0-CVE-2023-2977.patch |  49 -
 .../files/opensc-0.23.0-backport-pr2656.patch  | 215 -
 .../files/opensc-0.23.0-backport-pr2765.patch  |  39 
 dev-libs/opensc/opensc-0.23.0-r3.ebuild|  82 
 5 files changed, 386 deletions(-)

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 9a0b274dd7eb..a8557d421768 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,2 +1 @@
-DIST opensc-0.23.0.tar.gz 2366469 BLAKE2B 
c0f74379a70347a58be27684ae2cf833e6f35328b566af2c6daa8276174864406fa176acf7ba84931970fe07e3dd8d6eccf7884f079cb0110c4d6ff9a76792dc
 SHA512 
cd102cd64e719c59153960a4921b7525055045f16e6f6ffa8c9def6ce999a9c5098267b41f8753b41107f626bea20c34561002f5d38eddb4ce6b371913a17a1b
 DIST opensc-0.24.0.tar.gz 2440952 BLAKE2B 
afacdd151d169dd1840ecd6df1cec99a9805598d7b7af81e17b648f146cd1b3ad1d3dcae19ed94cf8ce0dbbd5b4285af9653af5ef5739d53908ce30a49544adb
 SHA512 
0fd2ea858874ae0b85c8fe8c4b920988693a47ca95b26449a1e95f86e17b76000f236c1f75d63ee133306e01a965155da5e14c1b8a59053b85026ecb58fb97bb

diff --git a/dev-libs/opensc/files/opensc-0.23.0-CVE-2023-2977.patch 
b/dev-libs/opensc/files/opensc-0.23.0-CVE-2023-2977.patch
deleted file mode 100644
index ad3bc1fadc93..
--- a/dev-libs/opensc/files/opensc-0.23.0-CVE-2023-2977.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 81944d1529202bd28359bede57c0a15deb65ba8a Mon Sep 17 00:00:00 2001
-From: fullwaywang 
-Date: Mon, 29 May 2023 10:38:48 +0800
-Subject: [PATCH] pkcs15init: correct left length calculation to fix buffer
- overrun bug. Fixes #2785
-

- src/pkcs15init/pkcs15-cardos.c | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c
-index 9715cf390f..f41f73c349 100644
 a/src/pkcs15init/pkcs15-cardos.c
-+++ b/src/pkcs15init/pkcs15-cardos.c
-@@ -872,7 +872,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card)
-   sc_apdu_t apdu;
- u8rbuf[SC_MAX_APDU_BUFFER_SIZE];
- int   r;
--  const u8  *p = rbuf, *q;
-+  const u8  *p = rbuf, *q, *pp;
-   size_tlen, tlen = 0, ilen = 0;
- 
-   sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xca, 0x01, 0x88);
-@@ -888,13 +888,13 @@ static int cardos_have_verifyrc_package(sc_card_t *card)
-   return 0;
- 
-   while (len != 0) {
--  p = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen);
--  if (p == NULL)
-+  pp = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen);
-+  if (pp == NULL)
-   return 0;
-   if (card->type == SC_CARD_TYPE_CARDOS_M4_3) {
-   /* the verifyRC package on CardOS 4.3B use Manufacturer 
ID 0x01 */
-   /* and Package Number 0x07  
*/
--  q = sc_asn1_find_tag(card->ctx, p, tlen, 0x01, &ilen);
-+  q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x01, &ilen);
-   if (q == NULL || ilen != 4)
-   return 0;
-   if (q[0] == 0x07)
-@@ -902,7 +902,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card)
-   } else if (card->type == SC_CARD_TYPE_CARDOS_M4_4)  {
-   /* the verifyRC package on CardOS 4.4 use Manufacturer 
ID 0x03  */
-   /* and Package Number 0x02  
*/
--  q = sc_asn1_find_tag(card->ctx, p, tlen, 0x03, &ilen);
-+  q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x03, &ilen);
-   if (q == NULL || ilen != 4)
-   return 0;
-   if (q[0] == 0x02)

diff --git a/dev-libs/opensc/files/opensc-0.23.0-backport-pr2656.patch 
b/dev-libs/opensc/files/opensc-0.23.0-backport-pr2656.patch
deleted file mode 100644
index f9ce72d31776..
--- a/dev-libs/opensc/files/opensc-0.23.0-backport-pr2656.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-https://bugs.gentoo.org/909781
-https://github.com/OpenSC/libp11/issues/478
-https://github.com/OpenSC/OpenSC/pull/2656
-
-From 99f7b82f187ca3512ceae6270c391243d018fdac Mon Sep 17 00:00:00 2001
-From: Jakub Jelen 
-Date: Thu, 1 Dec 2022 20:08:53 +0100
-Subject: [PATCH 1/4] 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-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/, dev-libs/opensc/files/

2023-07-17 Thread Sam James 
commit: 08f134943e605456a2506fbfe688cea0340059e9
Author: Matoro Mahri  users  noreply  github  
com>
AuthorDate: Mon Jul 17 22:06:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 17 22:14:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f13494

dev-libs/opensc: backport PR to fix dev-libs/libp11 tests

See: https://github.com/OpenSC/libp11/issues/478
See: https://github.com/OpenSC/OpenSC/pull/2656
Bug: https://bugs.gentoo.org/909781
Signed-off-by: Matoro Mahri  users.noreply.github.com>
Signed-off-by: Sam James  gentoo.org>

 .../files/opensc-0.23.0-backport-pr2656.patch  | 215 +
 dev-libs/opensc/opensc-0.23.0-r2.ebuild|  81 
 2 files changed, 296 insertions(+)

diff --git a/dev-libs/opensc/files/opensc-0.23.0-backport-pr2656.patch 
b/dev-libs/opensc/files/opensc-0.23.0-backport-pr2656.patch
new file mode 100644
index ..f9ce72d31776
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.23.0-backport-pr2656.patch
@@ -0,0 +1,215 @@
+https://bugs.gentoo.org/909781
+https://github.com/OpenSC/libp11/issues/478
+https://github.com/OpenSC/OpenSC/pull/2656
+
+From 99f7b82f187ca3512ceae6270c391243d018fdac Mon Sep 17 00:00:00 2001
+From: Jakub Jelen 
+Date: Thu, 1 Dec 2022 20:08:53 +0100
+Subject: [PATCH 1/4] 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);
+
+From 4a6e1d1dcd18757502027b1c5d2fb2cbaca28407 Mon Sep 17 00:00:00 2001
+From: Jakub Jelen 
+Date: Thu, 1 Dec 2022 20:11:41 +0100
+Subject: [PATCH 2/4] 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 ||
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/, dev-libs/opensc/files/

2023-06-10 Thread David Seifert 
commit: cc922f70f70016cf7fd197a8f492e654e0556f50
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun 10 19:06:40 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun 10 19:06:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc922f70

dev-libs/opensc: add patch for CVE-2023-2977

Bug: https://bugs.gentoo.org/907930
Signed-off-by: David Seifert  gentoo.org>

 .../opensc/files/opensc-0.23.0-CVE-2023-2977.patch | 49 +
 dev-libs/opensc/opensc-0.23.0-r1.ebuild| 83 ++
 2 files changed, 132 insertions(+)

diff --git a/dev-libs/opensc/files/opensc-0.23.0-CVE-2023-2977.patch 
b/dev-libs/opensc/files/opensc-0.23.0-CVE-2023-2977.patch
new file mode 100644
index ..ad3bc1fadc93
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.23.0-CVE-2023-2977.patch
@@ -0,0 +1,49 @@
+From 81944d1529202bd28359bede57c0a15deb65ba8a Mon Sep 17 00:00:00 2001
+From: fullwaywang 
+Date: Mon, 29 May 2023 10:38:48 +0800
+Subject: [PATCH] pkcs15init: correct left length calculation to fix buffer
+ overrun bug. Fixes #2785
+
+---
+ src/pkcs15init/pkcs15-cardos.c | 10 +-
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c
+index 9715cf390f..f41f73c349 100644
+--- a/src/pkcs15init/pkcs15-cardos.c
 b/src/pkcs15init/pkcs15-cardos.c
+@@ -872,7 +872,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card)
+   sc_apdu_t apdu;
+ u8rbuf[SC_MAX_APDU_BUFFER_SIZE];
+ int   r;
+-  const u8  *p = rbuf, *q;
++  const u8  *p = rbuf, *q, *pp;
+   size_tlen, tlen = 0, ilen = 0;
+ 
+   sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xca, 0x01, 0x88);
+@@ -888,13 +888,13 @@ static int cardos_have_verifyrc_package(sc_card_t *card)
+   return 0;
+ 
+   while (len != 0) {
+-  p = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen);
+-  if (p == NULL)
++  pp = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen);
++  if (pp == NULL)
+   return 0;
+   if (card->type == SC_CARD_TYPE_CARDOS_M4_3) {
+   /* the verifyRC package on CardOS 4.3B use Manufacturer 
ID 0x01 */
+   /* and Package Number 0x07  
*/
+-  q = sc_asn1_find_tag(card->ctx, p, tlen, 0x01, &ilen);
++  q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x01, &ilen);
+   if (q == NULL || ilen != 4)
+   return 0;
+   if (q[0] == 0x07)
+@@ -902,7 +902,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card)
+   } else if (card->type == SC_CARD_TYPE_CARDOS_M4_4)  {
+   /* the verifyRC package on CardOS 4.4 use Manufacturer 
ID 0x03  */
+   /* and Package Number 0x02  
*/
+-  q = sc_asn1_find_tag(card->ctx, p, tlen, 0x03, &ilen);
++  q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x03, &ilen);
+   if (q == NULL || ilen != 4)
+   return 0;
+   if (q[0] == 0x02)

diff --git a/dev-libs/opensc/opensc-0.23.0-r1.ebuild 
b/dev-libs/opensc/opensc-0.23.0-r1.ebuild
new file mode 100644
index ..9162e0939fc4
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.23.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 libtool
+
+DESCRIPTION="Libraries and applications to access smartcards"
+HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki";
+
+if [[ ${PV} == * ]]; then
+   inherit autotools git-r3
+   EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git";
+else
+   
SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz";
+   KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl 
test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+   readline? ( sys-libs/readline:0= )
+   ssl? ( dev-libs/openssl:0= )
+   openct? ( >=dev-libs/openct-0.5.0 )
+   pace? ( dev-libs/openpace:= )
+   pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+   notify? ( dev-libs/glib:2 )"
+DEPEND="${RDEPEND}
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+   pcsc-lite? ( !openct !ctapi )
+   openct? ( !pcsc-lite !ctapi )
+   ctapi? ( !pcsc-lite !openct )
+   || ( pcsc-lite openct ctapi )"
+
+PATCHES=( "${FILESDIR}"/${P}-CVE-2023-2977.patch )
+
+src_prepare() {
+   default
+
+   if [[ ${PV} == * ]]; then
+   e

[gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/, dev-libs/opensc/files/

2020-06-18 Thread Mikle Kolyada 
commit: 9aa6947ae348f91a97f301c0f0e76e6955612420
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Thu Jun 18 19:34:18 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jun 18 21:02:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa6947a

dev-libs/opensc: fix compilation with GCC10

Fix compilation with -fno-commons (see
https://github.com/OpenSC/OpenSC/pull/1939).
Closes: https://bugs.gentoo.org/706912
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Azamat H. Hackimov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16316
Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-libs/opensc/files/opensc-0.20.0-gcc10.patch | 37 +
 dev-libs/opensc/opensc-0.20.0.ebuild|  4 +++
 2 files changed, 41 insertions(+)

diff --git a/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch 
b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
new file mode 100644
index 000..f96a1140872
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.20.0-gcc10.patch
@@ -0,0 +1,37 @@
+From 5450f61681d0c46c587dbe789bf19f1cb573e794 Mon Sep 17 00:00:00 2001
+From: Jakub Jelen 
+Date: Mon, 10 Feb 2020 15:09:17 +0100
+Subject: [PATCH] Unbreak build with -fno-common (default in gcc10)
+
+---
+ src/tests/p11test/p11test.c| 3 +++
+ src/tests/p11test/p11test_common.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/tests/p11test/p11test.c b/src/tests/p11test/p11test.c
+index feecf6fb42..a16282cba3 100644
+--- a/src/tests/p11test/p11test.c
 b/src/tests/p11test/p11test.c
+@@ -34,6 +34,9 @@
+ 
+ #define DEFAULT_P11LIB"../../pkcs11/.libs/opensc-pkcs11.so"
+ 
++/* Global variable keeping information about token we are using */
++token_info_t token;
++
+ void display_usage() {
+   fprintf(stdout,
+   " Usage:\n"
+diff --git a/src/tests/p11test/p11test_common.h 
b/src/tests/p11test/p11test_common.h
+index 2f3b238de0..9eb5cedecb 100644
+--- a/src/tests/p11test/p11test_common.h
 b/src/tests/p11test/p11test_common.h
+@@ -84,7 +84,7 @@ typedef struct {
+   size_t  num_keygen_mechs;
+ } token_info_t;
+ 
+-token_info_t token;
++extern token_info_t token;
+ 
+ #endif /* P11TEST_COMMON_H */
+ 

diff --git a/dev-libs/opensc/opensc-0.20.0.ebuild 
b/dev-libs/opensc/opensc-0.20.0.ebuild
index d32490c9e60..fdfd50b8daa 100644
--- a/dev-libs/opensc/opensc-0.20.0.ebuild
+++ b/dev-libs/opensc/opensc-0.20.0.ebuild
@@ -36,6 +36,10 @@ REQUIRED_USE="
ctapi? ( !pcsc-lite !openct )
|| ( pcsc-lite openct ctapi )"
 
+PATCHES=(
+   "${FILESDIR}/${P}-gcc10.patch"
+)
+
 src_prepare() {
default
elibtoolize

[gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/, dev-libs/opensc/files/

2019-05-19 Thread Alon Bar-Lev 
commit: a91c516026b868da71fdd187beb8ca6a6f104161
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sun May 19 16:03:11 2019 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sun May 19 16:03:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a91c5160

dev-libs/opensc: cleanup old

Signed-off-by: Alon Bar-Lev  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-libs/opensc/Manifest   |   1 -
 dev-libs/opensc/files/opensc-0.18.0-build.patch| 100 -
 dev-libs/opensc/files/opensc-0.18.0-libressl.patch |  79 
 dev-libs/opensc/opensc-0.18.0.ebuild   |  61 -
 4 files changed, 241 deletions(-)

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index ebe4b6b70a0..0ac21a4400f 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,2 +1 @@
-DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B 
f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e
 SHA512 
dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768
 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B 
c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c74963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a
 SHA512 
90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e

diff --git a/dev-libs/opensc/files/opensc-0.18.0-build.patch 
b/dev-libs/opensc/files/opensc-0.18.0-build.patch
deleted file mode 100644
index 1db749ca654..000
--- a/dev-libs/opensc/files/opensc-0.18.0-build.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 1f1de5ae9a43e845431dc43af96ec61e910ad789 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev 
-Date: Wed, 16 May 2018 21:30:15 +0300
-Subject: [PATCH] build: fix --disable-sm
-

- src/libopensc/card-sc-hsm.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libopensc/card-sc-hsm.c b/src/libopensc/card-sc-hsm.c
-index e2af52b9..a609f612 100644
 a/src/libopensc/card-sc-hsm.c
-+++ b/src/libopensc/card-sc-hsm.c
-@@ -451,6 +451,7 @@ static int sc_hsm_soc_biomatch(sc_card_t *card, struct 
sc_pin_cmd_data *data,
- 
- 
- 
-+#ifdef ENABLE_SM
- #ifdef ENABLE_OPENPACE
- #include "sm/sm-eac.h"
- #include 
-@@ -573,6 +574,7 @@ static int sc_hsm_perform_chip_authentication(sc_card_t 
*card)
-   return SC_ERROR_NOT_SUPPORTED;
- }
- #endif
-+#endif
- 
- 
- 
--- 
-2.16.1
-
-From a6b4605b863d45978ebd681c4bbaa3aaf0ab90e7 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna 
-Date: Tue, 10 Jul 2018 14:49:42 +0200
-Subject: [PATCH] card-piv.c: initialize variable to fix a ppc64el build
- failure
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes a build failure with optimized ppc64el and new gcc builds
-card-piv.c: In function ‘piv_validate_general_authentication.isra.3’:
-card-piv.c:2390:9: error: ‘rbuflen’ may be used uninitialized in this function 
[-Werror=maybe-uninitialized]
-body = sc_asn1_find_tag(card->ctx, rbuf, rbuflen, 0x7c, &bodylen);
-~^~~~

- src/libopensc/card-piv.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c
-index e85dfc45..13b0cc21 100644
 a/src/libopensc/card-piv.c
-+++ b/src/libopensc/card-piv.c
-@@ -2334,7 +2334,7 @@ static int piv_validate_general_authentication(sc_card_t 
*card,
- 
-   u8 sbuf[4096]; /* needs work. for 3072 keys, needs 384+10 or so */
-   u8 *rbuf = NULL;
--  size_t rbuflen;
-+  size_t rbuflen = 0;
- 
-   SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);
- 
--- 
-2.16.4
-
-From 0f7af8a647a8fca6b1f1ee2327c3d26bed38c8f6 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev 
-Date: Sat, 8 Sep 2018 00:16:57 +0300
-Subject: [PATCH] reader-ctapi: ctapi_connect: remove unused variable
-
-from day 1 return value of _sc_parse_atr was ignored.

- src/libopensc/reader-ctapi.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c
-index 8d4c1c24..4b94337f 100644
 a/src/libopensc/reader-ctapi.c
-+++ b/src/libopensc/reader-ctapi.c
-@@ -239,7 +239,6 @@ static int ctapi_connect(sc_reader_t *reader)
-   char rv;
-   u8 cmd[9], rbuf[256], sad, dad;
-   unsigned short lr;
--  int r;
- 
-   if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE)
-   return SC_ERROR_NOT_ALLOWED;
-@@ -265,7 +264,7 @@ static int ctapi_connect(sc_reader_t *reader)
-   return SC_ERROR_INTERNAL;
-   reader->atr.len = lr;
-   memcpy(reader->atr.value, rbuf, lr);
--  r = _sc_parse_atr(reader);
-+  _sc_parse_atr(reader);
- 
-   return 0;
- }
--- 
-2.16.4
-

diff --git a/dev-libs/opensc/files/open

[gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/, dev-libs/opensc/files/

2019-04-02 Thread Alon Bar-Lev 
commit: 3e84ac178222a92c3bf3cc3ed1dbca0fc64a0d95
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Tue Apr  2 18:04:28 2019 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Tue Apr  2 18:04:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e84ac17

dev-libs/opensc: cleanup old

Signed-off-by: Alon Bar-Lev  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-libs/opensc/Manifest|   2 -
 dev-libs/opensc/files/opensc-0.17.0-build.patch | 100 
 dev-libs/opensc/opensc-0.16.0.ebuild|  55 -
 dev-libs/opensc/opensc-0.17.0.ebuild|  60 --
 4 files changed, 217 deletions(-)

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 6ebb2d0a9e6..ebe4b6b70a0 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,4 +1,2 @@
-DIST opensc-0.16.0.tar.gz 1760418 BLAKE2B 
7f5799445e285010392f315fa57919c7f0b038170a19e83dbda664d5d73898f075cccad4304275402c900b9fc50564ed5515a10d31156a6c76a68f170ca3e439
 SHA512 
15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139
-DIST opensc-0.17.0.tar.gz 1950547 BLAKE2B 
861dbb60e211d503332228c9d75d667f70cb9e15883c571821bb2f7703ca62dd4ce56c5ea7965e2d5e8c6a81b5063fc689013670294426baf1bfaec88282e20e
 SHA512 
8991c1724d187d3c34a2ed591b21f0085f767c0d866edc2decfda85a2b3dedf717838f4937d1dda3e1bbc17f02e6eca6740299660128bc448a29e8bfc2962922
 DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B 
f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e
 SHA512 
dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768
 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B 
c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c74963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a
 SHA512 
90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e

diff --git a/dev-libs/opensc/files/opensc-0.17.0-build.patch 
b/dev-libs/opensc/files/opensc-0.17.0-build.patch
deleted file mode 100644
index 8a51d7ac445..000
--- a/dev-libs/opensc/files/opensc-0.17.0-build.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 65b302e33b710833d4d14bf8eaf00acdaa436c39 Mon Sep 17 00:00:00 2001
-From: Frank Morgner 
-Date: Wed, 19 Jul 2017 00:09:36 +0200
-Subject: [PATCH] sc-hsm: fixed building with --disable-sm
-
-Closes https://github.com/OpenSC/OpenSC/pull/1103

- src/libopensc/card-sc-hsm.c | 21 -
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/libopensc/card-sc-hsm.c b/src/libopensc/card-sc-hsm.c
-index cfa084a06..1f61e0138 100644
 a/src/libopensc/card-sc-hsm.c
-+++ b/src/libopensc/card-sc-hsm.c
-@@ -284,7 +284,9 @@ static int sc_hsm_soc_select_minbioclient(sc_card_t *card)
-   };
- 
-   /* Select MinBioClient */
-+#ifdef ENABLE_SM
-   sc_sm_stop(card);
-+#endif
-   sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xA4, 0x04, 0x0C);
-   apdu.data = minBioClient_aid.value;
-   apdu.datalen = minBioClient_aid.len;
-@@ -533,7 +535,9 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct 
sc_pin_cmd_data *data,
-   sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data;
-   sc_apdu_t apdu;
-   u8 cmdbuff[16];
-+#ifdef ENABLE_SM
-   u8 rbuf[SC_MAX_APDU_BUFFER_SIZE];
-+#endif
-   int r;
-   int cmd = data->cmd;
-   size_t pin2_len = data->pin2.len;
-@@ -563,7 +567,10 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct 
sc_pin_cmd_data *data,
-   if ((card->type == SC_CARD_TYPE_SC_HSM_SOC || card->reader->uid.len
-   || cmd == SC_PIN_CMD_GET_SESSION_PIN)
-   && (data->cmd != SC_PIN_CMD_GET_INFO)
--  && card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) {
-+#ifdef ENABLE_SM
-+  && card->sm_ctx.sm_mode != SM_MODE_TRANSMIT
-+#endif
-+  ) {
-   LOG_TEST_RET(card->ctx,
-   sc_hsm_perform_chip_authentication(card),
-   "Could not perform chip authentication");
-@@ -604,6 +611,7 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct 
sc_pin_cmd_data *data,
-   data->apdu = &apdu;
-   }
- 
-+#ifdef ENABLE_SM
-   if ((data->cmd == SC_PIN_CMD_GET_INFO)
-   && (card->sm_ctx.sm_mode == SM_MODE_TRANSMIT)) {
-   /* JCOP's SM accelerator is incapable of using case 1 
APDU in SM */
-@@ -612,6 +620,7 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct 
sc_pin_cmd_data *data,
-   apdu.resplen = sizeof rbuf;
-   data->apdu = &apdu;
-   }
-+#endif
- 
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/, dev-libs/opensc/files/

2018-09-15 Thread Alon Bar-Lev 
commit: 1ea198753e1e74d6627ef6412abb2990a851426b
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat Sep 15 08:28:04 2018 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Sat Sep 15 08:28:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea19875

dev-libs/opensc: fix implicit invocation

fix implicit test, add missing upstream include.

add notify USE.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=666268
Thanks: Toralf Förster
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/opensc-0.19.0-p11test_common.h.patch | 108 +
 dev-libs/opensc/metadata.xml   |   3 +-
 ...pensc-0.19.0.ebuild => opensc-0.19.0-r1.ebuild} |  25 +++--
 3 files changed, 127 insertions(+), 9 deletions(-)

diff --git a/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch 
b/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch
new file mode 100644
index 000..ca27c70245d
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.19.0-p11test_common.h.patch
@@ -0,0 +1,108 @@
+From d1e4f4879b8d0a7423afc1c9a3632da4763ee31c Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev 
+Date: Sat, 15 Sep 2018 11:04:13 +0300
+Subject: [PATCH] missing include
+
+---
+ src/tests/p11test/p11test_common.h | 89 ++
+ 1 file changed, 89 insertions(+)
+ create mode 100644 src/tests/p11test/p11test_common.h
+
+diff --git a/src/tests/p11test/p11test_common.h 
b/src/tests/p11test/p11test_common.h
+new file mode 100644
+index 000..d3ca304
+--- /dev/null
 b/src/tests/p11test/p11test_common.h
+@@ -0,0 +1,89 @@
++/*
++ * p11test_common.h: Test suite shared declarations for PKCS#11 API
++ *
++ * Copyright (C) 2016 Martin Strhársky 
++ * Copyright (C) 2016, 2017 Red Hat, Inc.
++ *
++ * Author: Jakub Jelen 
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see .
++ */
++
++#ifndef P11TEST_COMMON_H
++#define P11TEST_COMMON_H
++#include "config.h"
++#include 
++#include 
++#include 
++#include 
++#include 
++#include "pkcs11/pkcs11.h"
++#include "libopensc/sc-ossl-compat.h"
++
++#define MAX_MECHS 200
++
++#ifndef NDEBUG
++  #define debug_print(fmt, ...) \
++  { fprintf(stderr, fmt "\n", ##__VA_ARGS__); } while (0)
++#else
++  #define debug_print(fmt, ...)
++#endif
++
++#define FLAGS_SIGN0x01
++#define FLAGS_SIGN_OPENSSL0x02
++#define FLAGS_SIGN_ANY( FLAGS_SIGN | FLAGS_SIGN_OPENSSL )
++#define FLAGS_DECRYPT 0x04
++#define FLAGS_DECRYPT_OPENSSL 0x08
++#define FLAGS_DECRYPT_ANY ( FLAGS_DECRYPT | FLAGS_DECRYPT_OPENSSL )
++
++typedef struct {
++  char *outfile;
++  FILE *fd;
++  int in_test;
++  int first;
++  int in_data;
++  int first_data;
++} log_context_t;
++
++typedef struct {
++  CK_MECHANISM_TYPE mech;
++  CK_MECHANISM_TYPE hash;
++  CK_RSA_PKCS_MGF_TYPE mgf;
++  int salt;
++  int usage_flags;
++  int result_flags;
++} test_mech_t;
++
++typedef struct {
++  CK_FUNCTION_LIST_PTR function_pointer;
++  CK_SLOT_ID slot_id;
++  CK_SESSION_HANDLE session_handle;
++  CK_UTF8CHAR* pin;
++  size_t pin_length;
++  char *library_path;
++  unsigned int interactive;
++  log_context_t log;
++
++  test_mech_t rsa_mechs[MAX_MECHS];
++  size_t  num_rsa_mechs;
++  test_mech_t ec_mechs[MAX_MECHS];
++  size_t  num_ec_mechs;
++  test_mech_t keygen_mechs[MAX_MECHS];
++  size_t  num_keygen_mechs;
++} token_info_t;
++
++token_info_t token;
++
++#endif /* P11TEST_COMMON_H */
++
+-- 
+2.16.4
+

diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index 52bf7f8f7bb..7c8bf05b0e8 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/metadata.xml
@@ -16,8 +16,9 @@
card.


-   Use dev-libs/openct (and CT-API) 
for accessing Smartcard hardware
Use CT-API for accessing Smartcard 
hardware
+   Enable notifications
+   Use dev-libs/openct (and CT-API) 
for accessing Smartcard hardware
Use sys-apps/pcsc-lite (and 
PC/SC API) for accessing Smartcard hardware
Enable secure messaging


diff --git a/dev-libs/opensc/opensc-0.19.0.ebuild 
b/dev-libs/opensc/opensc-0.19.0-r1.ebuild
similarity index 75%
rename from dev-li

[gentoo-commits] repo/gentoo:master commit in: dev-libs/opensc/, dev-libs/opensc/files/

2017-03-14 Thread Alon Bar-Lev 
commit: 1266680a192f79847de24d775c8c7d8056760521
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Tue Mar 14 23:32:19 2017 +
Commit: Alon Bar-Lev  gentoo  org>
CommitDate: Wed Mar 15 06:26:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1266680a

dev-libs/opensc: cleanup

Bug: 611512

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/opensc/Manifest   |  1 -
 .../opensc/files/opensc-0.12.1-crossbuild.patch| 38 ---
 dev-libs/opensc/files/opensc-0.12.2-dl.patch   | 42 -
 .../files/opensc-0.12.2-parallelinstall.patch  | 67 
 dev-libs/opensc/metadata.xml   |  4 --
 dev-libs/opensc/opensc-0.12.2-r2.ebuild| 73 --
 6 files changed, 225 deletions(-)

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index a1601c2cc3f..c55f52e15fd 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,2 +1 @@
-DIST opensc-0.12.2.tar.gz 1738553 SHA256 
50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675 SHA512 
544971f2c79723f618806c7043f0f1ffc25332752cbcaec97ffb1c99f9a2dff2237a6e5f5e020a4b9878921fec3a5234ca7e4fe9c8175c3f6142b169fcc65334
 WHIRLPOOL 
4969811d68d72e82c3a2b0297d5ff9aaca083b6ef8e66223d4385dce35cd9560cdda7cca8ccd38b52eb55465dbd6f8704485778b21d2a88bb548a5bbd87071e2
 DIST opensc-0.16.0.tar.gz 1760418 SHA256 
3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729 SHA512 
15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139
 WHIRLPOOL 
8207606e4994d7744fc93cc6aef1b0cde8a2073e791aebf71e82669013d261f82abc6e41ddf971fb136d4580c21ea475bb2e36bbdec600b354f5e1decec4b02a

diff --git a/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch 
b/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
deleted file mode 100644
index 008fd3c3570..000
--- a/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
+++ /dev/null
@@ -1,38 +0,0 @@
 src/pkcs11/Makefile.am 2011-05-17 13:07:00.0 -0400
-+++ Makefile.am.new2011-07-07 10:03:28.399185928 -0400
-@@ -14,9 +14,10 @@
-   mechanism.c openssl.c framework-pkcs15.c \
-   framework-pkcs15init.c debug.c opensc-pkcs11.exports \
-   pkcs11-display.c pkcs11-display.h
--OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS) \
-+OPENSC_PKCS11_LIBS = \
-   $(top_builddir)/src/common/libcompat.la \
--  $(top_builddir)/src/libopensc/libopensc.la
-+  $(top_builddir)/src/libopensc/libopensc.la \
-+  $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS)
- 
- opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) 
hack-disabled.c
- opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
-@@ -31,7 +32,7 @@
-   -module -shared -avoid-version -no-undefined
- 
- pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h 
pkcs11-spy.exports
--pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) 
$(top_builddir)/src/common/libpkcs11.la
-+pkcs11_spy_la_LIBADD = $(top_builddir)/src/common/libpkcs11.la 
$(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
- pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
-   -export-symbols "$(srcdir)/pkcs11-spy.exports" \
-   -module -shared -avoid-version -no-undefined
 src/tools/Makefile.am  2011-05-17 13:07:00.0 -0400
-+++ Makefile.am.new2011-07-07 10:06:08.710185925 -0400
-@@ -24,8 +24,9 @@
- pkcs15_tool_SOURCES = pkcs15-tool.c util.c
- pkcs15_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
- pkcs11_tool_SOURCES = pkcs11-tool.c util.c
--pkcs11_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \
--  $(top_builddir)/src/common/libpkcs11.la
-+pkcs11_tool_LDADD = \
-+  $(top_builddir)/src/common/libpkcs11.la \
-+  $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
- pkcs15_crypt_SOURCES = pkcs15-crypt.c util.c
- pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_LIBS)
- cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c

diff --git a/dev-libs/opensc/files/opensc-0.12.2-dl.patch 
b/dev-libs/opensc/files/opensc-0.12.2-dl.patch
deleted file mode 100644
index 526ef8161a8..000
--- a/dev-libs/opensc/files/opensc-0.12.2-dl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1b896582a0cd74854f99e08854554807a8f1f764 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Tue, 22 May 2012 14:12:23 -0400
-Subject: [PATCH] link against -ldl when -lltdl is not available
-
-If ltdl isn't found, the code will use dlopen if it's available.
-But it won't link to -ldl which can cause link errors like so:
-
-  CCLD   opensc-tool
-../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlopen'
-../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlsym'
-../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlerror'
-../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlclose'
-collect2: ld returned 1 exit status
-make[3]: *** [opensc-tool] E