From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/opensc/files/opensc-0.17.0-build.patch | 100 --------------------- dev-libs/opensc/files/opensc-0.18.0-build.patch | 32 ------- dev-libs/opensc/files/opensc-0.18.0-libressl.patch | 79 ---------------- 3 files changed, 211 deletions(-) delete mode 100644 dev-libs/opensc/files/opensc-0.17.0-build.patch delete mode 100644 dev-libs/opensc/files/opensc-0.18.0-build.patch delete mode 100644 dev-libs/opensc/files/opensc-0.18.0-libressl.patch (limited to 'dev-libs/opensc/files') 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 8a51d7ac4450..000000000000 --- 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 - - data->pin1.offset = 5; - data->pin1.length_offset = 4; -@@ -627,11 +636,17 @@ static int sc_hsm_pin_cmd(sc_card_t *card, struct sc_pin_cmd_data *data, - data->cmd = SC_PIN_CMD_GET_SESSION_PIN; - if (data->pin_reference == 0x81) { - u8 recvbuf[SC_MAX_APDU_BUFFER_SIZE]; -+#ifdef ENABLE_SM - if (card->sm_ctx.sm_mode != SM_MODE_TRANSMIT) { - sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, - "Session PIN generation only supported in SM"); - LOG_FUNC_RETURN(card->ctx, SC_SUCCESS); - } -+#else -+ sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, -+ "Session PIN generation only supported in SM"); -+ LOG_FUNC_RETURN(card->ctx, SC_SUCCESS); -+#endif - sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0x5A, 0x01, data->pin_reference); - apdu.cla = 0x80; - apdu.resp = recvbuf; -@@ -669,7 +684,9 @@ static int sc_hsm_logout(sc_card_t * card) - sc_path_t path; - sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data; - memset(priv->sopin, 0, sizeof(priv->sopin)); -+#ifdef ENABLE_SM - sc_sm_stop(card); -+#endif - - sc_path_set(&path, SC_PATH_TYPE_DF_NAME, sc_hsm_aid.value, sc_hsm_aid.len, 0, 0); - -@@ -1586,7 +1603,9 @@ static int sc_hsm_init(struct sc_card *card) - static int sc_hsm_finish(sc_card_t * card) - { - sc_hsm_private_data_t *priv = (sc_hsm_private_data_t *) card->drv_data; -+#ifdef ENABLE_SM - sc_sm_stop(card); -+#endif - if (priv->serialno) { - free(priv->serialno); - } 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 2bea2e53d595..000000000000 --- a/dev-libs/opensc/files/opensc-0.18.0-build.patch +++ /dev/null @@ -1,32 +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 - diff --git a/dev-libs/opensc/files/opensc-0.18.0-libressl.patch b/dev-libs/opensc/files/opensc-0.18.0-libressl.patch deleted file mode 100644 index f6f3d772e071..000000000000 --- a/dev-libs/opensc/files/opensc-0.18.0-libressl.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 226cd96bfd384a40b3ab6b6dafb97f6e399524f4 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Fri, 22 Jun 2018 22:21:03 +0300 -Subject: [PATCH] build: support >=libressl-2.7 - -https://github.com/OpenSC/OpenSC/pull/1406 - ---- - src/libopensc/sc-ossl-compat.h | 19 +++++++++++++------ - src/tools/sc-hsm-tool.c | 2 +- - 2 files changed, 14 insertions(+), 7 deletions(-) - -diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h -index a94d9564..d9e087a3 100644 ---- a/src/libopensc/sc-ossl-compat.h -+++ b/src/libopensc/sc-ossl-compat.h -@@ -90,17 +90,24 @@ extern "C" { - - #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay --#define OPENSSL_malloc_init CRYPTO_malloc_init - --#define EVP_PKEY_get0_RSA(x) (x->pkey.rsa) --#define EVP_PKEY_get0_DSA(x) (x->pkey.dsa) - #define X509_get_extension_flags(x) (x->ex_flags) - #define X509_get_key_usage(x) (x->ex_kusage) - #define X509_get_extended_key_usage(x) (x->ex_xkusage) --#define EVP_PKEY_up_ref(user_key) CRYPTO_add(&user_key->references, 1, CRYPTO_LOCK_EVP_PKEY) - #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050300fL - #define X509_up_ref(cert) CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509) - #endif -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20700000L -+#define OPENSSL_malloc_init CRYPTO_malloc_init -+#define EVP_PKEY_get0_RSA(x) (x->pkey.rsa) -+#define EVP_PKEY_get0_DSA(x) (x->pkey.dsa) -+#define EVP_PKEY_up_ref(user_key) CRYPTO_add(&user_key->references, 1, CRYPTO_LOCK_EVP_PKEY) -+#endif -+#endif -+ -+/* workaround unused value warning for a macro that does nothing */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L -+#define OPENSSL_malloc_init() - #endif - - /* -@@ -110,7 +117,7 @@ extern "C" { - * If that is not good enough, versions could be added to libopensc - */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - /* based on OpenSSL-1.1.0 e_os2.h */ - /* sc_ossl_inline: portable inline definition usable in public headers */ - # if !defined(inline) && !defined(__cplusplus) -@@ -129,7 +136,7 @@ extern "C" { - # endif - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2050300fL) - - #define RSA_bits(R) (BN_num_bits(R->n)) - -diff --git a/src/tools/sc-hsm-tool.c b/src/tools/sc-hsm-tool.c -index 823eb217..307bad25 100644 ---- a/src/tools/sc-hsm-tool.c -+++ b/src/tools/sc-hsm-tool.c -@@ -1761,7 +1761,7 @@ int main(int argc, char *argv[]) - } - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L) - OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS - | OPENSSL_INIT_ADD_ALL_CIPHERS - | OPENSSL_INIT_ADD_ALL_DIGESTS, --- -2.16.4 - -- cgit v1.2.3