opensc: update to 0.19.0.

* 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
This commit is contained in:
maxice8 2018-09-22 12:21:30 -03:00 committed by maxice8
parent d3b3e39eb5
commit 579d104d9f
2 changed files with 2 additions and 44 deletions

View file

@ -1,42 +0,0 @@
$OpenBSD: patch-src_libopensc_sc-ossl-compat_h,v 1.3 2018/02/18 14:21:23 sthen Exp $
Index: src/libopensc/sc-ossl-compat.h
--- src/libopensc/sc-ossl-compat.h.orig
+++ src/libopensc/sc-ossl-compat.h
@@ -92,12 +92,16 @@ extern "C" {
#define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay
#define OPENSSL_malloc_init CRYPTO_malloc_init
+#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)
+#endif
#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_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
@@ -110,7 +114,8 @@ 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 < 0x2070000fL)
/* based on OpenSSL-1.1.0 e_os2.h */
/* sc_ossl_inline: portable inline definition usable in public headers */
# if !defined(inline) && !defined(__cplusplus)
@@ -127,9 +132,6 @@ extern "C" {
# else
# define sc_ossl_inline inline
# endif
-#endif
-
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define RSA_bits(R) (BN_num_bits(R->n))

View file

@ -1,6 +1,6 @@
# Template file for 'opensc'
pkgname=opensc
version=0.18.0
version=0.19.0
revision=1
wrksrc="OpenSC-${version}"
build_style=gnu-configure
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="LGPL-2.1-or-later"
homepage="https://github.com/OpenSC/OpenSC/wiki"
distfiles="https://github.com/OpenSC/OpenSC/archive/${version}.tar.gz"
checksum=6ef62b00e8fdbe3e386c3ee25c2cadb56c1931ea42f1a11dce8c947f51b45033
checksum=c0b803ba36aac9b5fef7f249adb9dffaf3f298db85304531b6a0574519743cf2
conf_files="/etc/opensc.conf"
pre_configure() {