diff options
Diffstat (limited to 'community/opensc')
| -rw-r--r-- | community/opensc/APKBUILD | 28 | ||||
| -rw-r--r-- | community/opensc/add-ecc-curves.patch | 12 | ||||
| -rw-r--r-- | community/opensc/libressl-2.7.patch | 39 |
3 files changed, 20 insertions, 59 deletions
diff --git a/community/opensc/APKBUILD b/community/opensc/APKBUILD index ea106e24a3..62aac1e073 100644 --- a/community/opensc/APKBUILD +++ b/community/opensc/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=opensc _realname=OpenSC -pkgver=0.17.0 -pkgrel=5 +pkgver=0.19.0 +pkgrel=0 pkgdesc="Open source smart card tools and middleware" url="https://github.com/OpenSC/OpenSC" arch="all" @@ -13,12 +13,26 @@ depends_dev="zlib-dev pcsc-lite-dev openssl-dev readline-dev" makedepends="$depends_dev automake autoconf m4 gettext libtool" install="" subpackages="$pkgname-dev $pkgname-doc" -source="$_realname-${pkgver}.tar.gz::https://github.com/OpenSC/OpenSC/archive/${pkgver}.tar.gz - add-ecc-curves.patch - libressl-2.7.patch" +source="$_realname-${pkgver}.tar.gz::https://github.com/OpenSC/OpenSC/archive/${pkgver}.tar.gz" builddir="$srcdir/$_realname-$pkgver" +# secfixes: +# 0.19.0-r0: +# - CVE-2018-16391 +# - CVE-2018-16392 +# - CVE-2018-16393 +# - CVE-2018-16418 +# - CVE-2018-16419 +# - CVE-2018-16420 +# - CVE-2018-16421 +# - CVE-2018-16422 +# - CVE-2018-16423 +# - CVE-2018-16424 +# - CVE-2018-16425 +# - CVE-2018-16426 +# - CVE-2018-16427 + build() { cd "$builddir" ./bootstrap @@ -45,6 +59,4 @@ package() { "$pkgdir/etc/opensc.conf" } -sha512sums="1576a9ca58e80c95b23bf53fba03b14b174361c054a3e836bcfbe96765308a2ba807b819e0d617707fdef32ce2e3ae1ab74766bc1e82eeaf218d48a18ec8e67f OpenSC-0.17.0.tar.gz -c78cd58f58eca6db17a093157c20b8eb3457fffc04e3849c7a3cf7f476b84c49686c7815dafbf82df7f48aebc4169b2ac0621d47f41f0157fec3af3d48d51cfb add-ecc-curves.patch -bde4acf9bbb988f93a3f7f6d63ae451593174ed8e901028db3e69c29e02f4b9b409e8dc09aa9f73cae7c1fc71ab64b78d50f1f865967c309d151bcefa25d19f3 libressl-2.7.patch" +sha512sums="a54161b72e6ecea9d61d8bdf0fe0dbd0f97dd8fff0ce6ce344442d9dd9218779851054f8a9049c95c4276e69d3ab96afd0906ebb3278739c8f8e32ad3dbf2d4b OpenSC-0.19.0.tar.gz" diff --git a/community/opensc/add-ecc-curves.patch b/community/opensc/add-ecc-curves.patch deleted file mode 100644 index 9d88a1c33d..0000000000 --- a/community/opensc/add-ecc-curves.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c -index 63e5c5f7..7845c99f 100644 ---- a/src/tools/pkcs11-tool.c -+++ b/src/tools/pkcs11-tool.c -@@ -109,6 +109,7 @@ static struct ec_curve_info { - {"brainpoolP224r1", "1.3.36.3.3.2.8.1.1.5", "06092B2403030208010105", 224}, - {"brainpoolP256r1", "1.3.36.3.3.2.8.1.1.7", "06092B2403030208010107", 256}, - {"brainpoolP320r1", "1.3.36.3.3.2.8.1.1.9", "06092B2403030208010109", 320}, -+ {"brainpoolP384r1", "1.3.36.3.3.2.8.1.1.11", "06092B240303020801010B", 384}, - - {"secp192k1", "1.3.132.0.31", "06052B8104001F", 192}, - {"secp256k1", "1.3.132.0.10", "06052B8104000A", 256}, diff --git a/community/opensc/libressl-2.7.patch b/community/opensc/libressl-2.7.patch deleted file mode 100644 index 3904bd2c13..0000000000 --- a/community/opensc/libressl-2.7.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h -index 2c853be..0a4e1c7 100644 ---- a/src/libopensc/sc-ossl-compat.h -+++ b/src/libopensc/sc-ossl-compat.h -@@ -92,12 +92,14 @@ extern "C" { - #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) -+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL -+#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 - #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050300fL - #define X509_up_ref(cert) CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509) - #endif -@@ -129,7 +131,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 < 0x2070000fL) - - #define RSA_bits(R) (BN_num_bits(R->n)) - -@@ -217,7 +219,7 @@ static sc_ossl_inline void RSA_get0_crt_params(const RSA *r, - - #endif /* OPENSSL_NO_RSA */ - --#ifndef OPENSSL_NO_DSA -+#if !defined(OPENSSL_NO_DSA) && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL) - static sc_ossl_inline void DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) - { - if (p != NULL) |