gentoo resync : 18.08.2019

3 files changed, 290 insertions, 7 deletions

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 11f019c5c5a4..d5342a938fb6 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,6 +1,7 @@
+AUX eid-sign-test-4.4.19.patch 8320 BLAKE2B c2295a64a5353f79ea44703b7256f667b5c6dc21eb74b0cfb6945572d0323d751ca8104ae981ae83759267081b6a16509cde3e8f5ad35b1a6613855461880c18 SHA512 01efa77441982a631e717a1bf720155bd38144cbe9e5b9cc192bdfa7ea3966b787e31a25a7e3c7d560fec30b19edeb662f6ab1db2d68b0a5b996af3c91342ec4
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
-DIST eid-mw-4.4.11.tar.gz 7975630 BLAKE2B e7b052736cba98c53e97e9de15ea8e54f508c28471a7a936c5d28539648f5d3454983d9c9a21cf5959a070849865de5ca58d5d29ad64eb08209afd40959c56ae SHA512 35273492abc0efa7146848c82770bcd5e4ce1b7c9971ce45686b4d3244332456011db6df05154ad6a204854fd13ac3dce8f7b8cd6112a2e60a7b8434f3c4a196
+DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848 SHA512 21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
 EBUILD eid-mw-4.4.1.ebuild 2106 BLAKE2B 07d74477ca6ff373abf1168f520dd33179984691ab192fedff4d9370a68addc4990dc7172be8b1e6d8813da8089c534ed8c577daedd0aa7d2bfae6011f8e0f2d SHA512 a86805eed173ea10bb088d2374f134d9841257c2a51d5ffb51c0316811e62794243129965bb1ed46bc45419826e6ae1c4781cc8a9addf62e98f5411bf4cdde3e
-EBUILD eid-mw-4.4.11.ebuild 2151 BLAKE2B 3350790665454d681dc7513c33a8f3d1a74caebd5bd2f1683b02a32b4bbee85c64c5457ff50a4f14819ec421832fd0a372df7c60f313bc20a6d67229246e6b9e SHA512 b7c555ef7eb1ef96bc4a8df040648548698408fcf81f72c3fa5d37641287080101593d49f628de9ae9f8ddb42ebd45f55c40ec8c73aecf3b7ba8f954027d5cc2
+EBUILD eid-mw-4.4.19.ebuild 2433 BLAKE2B 07aa37e8d8d8abd22d8d46c1efbdd908e8cd76452b2d7fa50765d22326ddffcd140c02614db5469547fd81e8efe6f3fca4df681148a8d09a799f7ffb46db221d SHA512 b809f8d26a9357e848b5e59e10dd2aa9a07fdf2b410f1fc4ad4f4c8f232c996977c37ac68151434f44037bfe4230b67507dca8fae39ad219fb4f565d044cfd75
 EBUILD eid-mw-9999.ebuild 1832 BLAKE2B c6c9b0de69514b1d036e8e3566e8ecbcfdd6426bcc55bdbcfce15de389dca83d65a0cf50d3e9eb5b35fca7114e02e13cf3bfd3139e46298874ea5b872248b007 SHA512 1c4383bb1764fe4f8dbeabad9be447d682e2ee08e8174a7d7aa4a978c1243048cfcae54dc0d7b45e6acaa415b52cde1199aee6f94f5b9ef1f790f632dfbc28ee
 MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98
diff --git a/app-crypt/eid-mw/eid-mw-4.4.11.ebuild b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
index e496d37797e7..98c8bfee6ce3 100644
--- a/app-crypt/eid-mw/eid-mw-4.4.11.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools gnome2-utils
+inherit autotools desktop gnome2-utils xdg-utils
 
 DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
 HOMEPAGE="https://eid.belgium.be"
@@ -56,6 +56,14 @@ src_prepare() {
 		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
 		plugins_tools/aboutmw/gtk/about-main.c || die
 
+	# Fix libdir for pkcs11_manifestdir
+	sed -i \
+		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+		cardcomm/pkcs11/src/Makefile.am || die
+
+	# See bug #691308
+	eapply "${FILESDIR}/eid-sign-test-${PV}.patch"
+
 	eautoreconf
 }
 
@@ -81,13 +89,15 @@ src_install() {
 pkg_postinst(){
 	if use gtk; then
 		gnome2_schemas_update
-		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
 	fi
 }
 
 pkg_postrm(){
 	if use gtk; then
 		gnome2_schemas_update
-		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
 	fi
 }
diff --git a/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch b/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch
new file mode 100644
index 000000000000..cf59f99a8ea7
--- /dev/null
+++ b/app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch
@@ -0,0 +1,272 @@
+--- eid-mw-4.4.19/tests/unit/sign.c	2019-07-11 16:08:46.000000000 +0200
++++ eid-mw-git/tests/unit/sign.c	2019-08-04 17:40:08.683942928 +0200
+@@ -19,10 +19,13 @@
+ **************************************************************************** */
+ #ifdef WIN32
+ #include <win32.h>
++#pragma pack(push, cryptoki, 1)
++#include "pkcs11.h"
++#pragma pack(pop, cryptoki)
+ #else
+ #include <unix.h>
+-#endif
+ #include <pkcs11.h>
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -33,66 +36,88 @@
+ #include <config.h>
+ #endif
+ 
++#include <stdbool.h>
++
+ #if HAVE_OPENSSL
+-#include <openssl/rsa.h>
++#include <openssl/opensslv.h>
++#include <openssl/evp.h>
+ #include <openssl/engine.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+-static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
+-	if(!r || !n || !e) {
+-		return 0;
+-	}
+-	r->n = n;
+-	r->e = e;
+-	r->d = d;
+-	return 1;
+-}
+-#endif
+-
+-CK_BYTE digest_sha256[] = {
+-                0x2c, 0x26, 0xb4, 0x6b,
+-                0x68, 0xff, 0xc6, 0x8f,
+-                0xf9, 0x9b, 0x45, 0x3c,
+-                0x1d, 0x30, 0x41, 0x34,
+-                0x13, 0x42, 0x2d, 0x70,
+-		0x64, 0x83, 0xbf, 0xa0,
+-		0xf9, 0x8a, 0x5e, 0x88,
+-		0x62, 0x66, 0xe7, 0xae
+-};
+-
+-int verify_sig(unsigned char* sig, CK_ULONG siglen, CK_BYTE_PTR modulus, CK_ULONG modlen, CK_BYTE_PTR exponent, CK_ULONG explen) {
+-	RSA* rsa = RSA_new();
+-	unsigned char* s = malloc(siglen);
+-	int ret;
+-
+-	RSA_set0_key(rsa, BN_bin2bn(modulus, (int) modlen, NULL), BN_bin2bn(exponent, (int) explen, NULL), NULL);
+-
+-	int v = RSA_verify(NID_sha256, digest_sha256, sizeof(digest_sha256), sig, siglen, rsa);
+-
+-	printf("Signature verification returned: %d\n", v);
+-	if(!v) {
+-		unsigned long e = ERR_get_error();
+-		printf("error %ld: %s\n", e, ERR_error_string(e, NULL));
+-		ret = TEST_RV_FAIL;
+-	} else {
+-		ret = TEST_RV_OK;
++// These were copied from eid-test-ca:derencode.c
++int verify_sig(const unsigned char *sig_in, CK_ULONG siglen, const unsigned char *certificate, size_t certlen, bool is_rsa) {
++#if OPENSSL_VERSION_NUMBER > 0x10100000L
++	X509 *cert = NULL;
++	EVP_PKEY *pkey = NULL;
++	EVP_MD_CTX *mdctx;
++	EVP_PKEY_CTX *pctx;
++	const EVP_MD *md = EVP_get_digestbyname("sha256");
++	unsigned char *sig = (unsigned char*)sig_in;
++
++	if(d2i_X509(&cert, &certificate, certlen) == NULL) {
++		fprintf(stderr, "E: could not parse X509 certificate\n");
++		return TEST_RV_FAIL;
++	}
++	pkey = X509_get0_pubkey(cert);
++	if(pkey == NULL) {
++		fprintf(stderr, "E: could not find public key in certificate\n");
++		return TEST_RV_FAIL;
++	}
++	mdctx = EVP_MD_CTX_new();
++	if(EVP_DigestVerifyInit(mdctx, &pctx, md, NULL, pkey) != 1) {
++		fprintf(stderr, "E: initialization for signature validation failed!\n");
++		return TEST_RV_FAIL;
++	}
++	if(EVP_DigestVerifyUpdate(mdctx, (const unsigned char*)"foo", 3) != 1) {
++		fprintf(stderr, "E: hashing for signature failed!\n");
++		return TEST_RV_FAIL;
+ 	}
+ 
+-	free(s);
+-	RSA_free(rsa);
+-
+-	return ret;
++	ECDSA_SIG* ec_sig;
++	if(!is_rsa) {
++		BIGNUM *r;
++		BIGNUM *s;
++		ec_sig = ECDSA_SIG_new();
++		if((r = BN_bin2bn(sig, siglen / 2, NULL)) == NULL) {
++			fprintf(stderr, "E: could not convert R part of ECDSA signature!\n");
++			return TEST_RV_FAIL;
++		}
++		if((s = BN_bin2bn(sig + (siglen / 2), siglen / 2, NULL)) == NULL) {
++			fprintf(stderr, "E: could not convert S part of ECDSA signature!\n");
++			return TEST_RV_FAIL;
++		}
++		if(ECDSA_SIG_set0(ec_sig, r, s) == 0) {
++			fprintf(stderr, "E: could not set ECDSA_SIG structure!\n");
++			return TEST_RV_FAIL;
++		}
++		siglen = i2d_ECDSA_SIG(ec_sig, NULL);
++		unsigned char *dersig = sig = malloc(siglen);
++		siglen = i2d_ECDSA_SIG(ec_sig, &dersig);
++	}
++	if(EVP_DigestVerifyFinal(mdctx, sig, siglen) != 1) {
++		fprintf(stderr, "E: signature fails validation!\n");
++		return TEST_RV_FAIL;
++	}
++	if(!is_rsa) {
++		free(sig);
++	}
++	printf("signature verified\n");
++	return TEST_RV_OK;
++#else
++	printf("OpenSSL too old for verification\n");
++#endif
+ }
+-
+ #endif
+ 
+-int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot EIDT_UNUSED) {
++int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot) {
+ 	CK_ATTRIBUTE attr[2];
+ 	CK_MECHANISM mech;
++	CK_MECHANISM_TYPE_PTR mechlist;
+ 	CK_BYTE data[] = { 'f', 'o', 'o' };
+ 	CK_BYTE_PTR sig, mod, exp;
+ 	CK_ULONG sig_len, type, count;
+-	CK_OBJECT_HANDLE privatekey, publickey;
++	CK_OBJECT_HANDLE privatekey, publickey, certificate;
++	bool is_rsa = false;
++	int i;
+ 
+ 	attr[0].type = CKA_CLASS;
+ 	attr[0].pValue = &type;
+@@ -113,7 +138,22 @@
+ 		return TEST_RV_SKIP;
+ 	}
+ 
+-	mech.mechanism = CKM_SHA256_RSA_PKCS;
++	check_rv(C_GetMechanismList(slot, NULL_PTR, &count));
++	mechlist = malloc(sizeof(CK_MECHANISM_TYPE) * count);
++#undef CHECK_RV_DEALLOCATE
++#define CHECK_RV_DEALLOCATE free(mechlist)
++
++	check_rv(C_GetMechanismList(slot, mechlist, &count));
++
++	for(i=0; i<count; i++) {
++		if(mechlist[i] == CKM_SHA256_RSA_PKCS) {
++			mech.mechanism = mechlist[i];
++			i=count;
++			is_rsa = true;
++			break;
++		}
++	}
++
+ 	check_rv(C_SignInit(session, &mech, privatekey));
+ 
+ 	check_rv(C_Sign(session, data, sizeof(data), NULL, &sig_len));
+@@ -124,42 +164,68 @@
+ 
+ 	hex_dump((char*)sig, sig_len);
+ 
+-	type = CKO_PUBLIC_KEY;
+-	check_rv(C_FindObjectsInit(session, attr, 2));
+-	check_rv(C_FindObjects(session, &publickey, 1, &count));
+-	verbose_assert(count == 1);
+-	check_rv(C_FindObjectsFinal(session));
++	if(is_rsa) {
++		type = CKO_PUBLIC_KEY;
++		check_rv(C_FindObjectsInit(session, attr, 2));
++		check_rv(C_FindObjects(session, &publickey, 1, &count));
++		verbose_assert(count == 1);
++		check_rv(C_FindObjectsFinal(session));
+ 
+-	attr[0].type = CKA_MODULUS;
+-	attr[0].pValue = NULL_PTR;
+-	attr[0].ulValueLen = 0;
++		attr[0].type = CKA_MODULUS;
++		attr[0].pValue = NULL_PTR;
++		attr[0].ulValueLen = 0;
+ 
+-	attr[1].type = CKA_PUBLIC_EXPONENT;
+-	attr[1].pValue = NULL_PTR;
+-	attr[1].ulValueLen = 0;
++		attr[1].type = CKA_PUBLIC_EXPONENT;
++		attr[1].pValue = NULL_PTR;
++		attr[1].ulValueLen = 0;
+ 
+-	check_rv(C_GetAttributeValue(session, publickey, attr, 2));
++		check_rv(C_GetAttributeValue(session, publickey, attr, 2));
+ 
+-	verbose_assert(attr[0].ulValueLen == sig_len);
++		verbose_assert(attr[0].ulValueLen == sig_len);
+ 
+-	mod = malloc(attr[0].ulValueLen);
+-	mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
+-	exp = malloc(attr[1].ulValueLen);
+-	exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
++		mod = malloc(attr[0].ulValueLen);
++		mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
++		exp = malloc(attr[1].ulValueLen);
++		exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
+ 
+-	attr[0].pValue = mod;
+-	attr[1].pValue = exp;
++		attr[0].pValue = mod;
++		attr[1].pValue = exp;
+ 
+-	check_rv(C_GetAttributeValue(session, publickey, attr, 2));
++		check_rv(C_GetAttributeValue(session, publickey, attr, 2));
+ 
+-	printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
+-	hex_dump((char*)mod, attr[0].ulValueLen);
++		printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
++		hex_dump((char*)mod, attr[0].ulValueLen);
+ 
+-	printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
+-	hex_dump((char*)exp, attr[1].ulValueLen);
++		printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
++		hex_dump((char*)exp, attr[1].ulValueLen);
++	}
+ 
+-#if HAVE_OPENSSL
+-	return verify_sig(sig, sig_len, mod, attr[0].ulValueLen, exp, attr[1].ulValueLen);
++#if HAVE_OPENSSL && OPENSSL_VERSION_NUMBER > 0x10100000L
++	unsigned char cert[4096];
++	attr[0].type = CKA_CLASS;
++	attr[0].pValue = &type;
++	type = CKO_CERTIFICATE;
++	attr[0].ulValueLen = sizeof(CK_ULONG);
++
++	attr[1].type = CKA_LABEL;
++	attr[1].pValue = label;
++	attr[1].ulValueLen = strlen(label);
++
++	check_rv(C_FindObjectsInit(session, attr, 2));
++	check_rv(C_FindObjects(session, &certificate, 1, &count));
++	verbose_assert(count == 1);
++	check_rv(C_FindObjectsFinal(session));
++
++	attr[0].type = CKA_VALUE;
++	attr[0].pValue = cert;
++	attr[0].ulValueLen = sizeof(cert);
++
++	check_rv(C_GetAttributeValue(session, certificate, attr, 1));
++
++	printf("Received certificate with length %lu:\n", attr[0].ulValueLen);
++	hex_dump((char*)cert, attr[0].ulValueLen);
++
++	return verify_sig(sig, sig_len, cert, attr[0].ulValueLen, is_rsa);
+ #else
+ 	return TEST_RV_OK;
+ #endif