libp11-0.4.11 with libressl patch

This commit is contained in:
Sandino Araico Sanchez 2021-01-15 06:25:35 -06:00
parent ebbd40bf11
commit 9125876f7b
6 changed files with 51 additions and 35 deletions

View file

@ -1,5 +1,5 @@
DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
AUX libp11-0.4.11-libressl.patch 602 BLAKE2B c1d3e712dd6f24b606110b6c121fc84b01ff5530824231ea7adb3117e430f4d9e891984088ed72584590f82c57d2a9fd99c642897702c3613cd5e997b483d9b9 SHA512 974bdd3763ed5d7620a6014157702bd0ff1d7b3d6226519e35a92907f52f7a5bc40b77d486b366971dcc957a89cb4d05d3b766e66780a447c5deb2e28853d80e
AUX libp11-Libressl-3.0.1.patch 1159 BLAKE2B 54f97e087b96f6cd5a3f2265fd0a60c0fa4b751ac8969ddbe70b59b638984d428cc77f0454e4ae56b05ce5ec577912ed51cd9528cedfb31c87420bd5b5aeb27b SHA512 c07ddae6382cd37624df7bc2d0c6adb22bfc7211fd2f2b7f4e767cc68aea33c7ebda61a291fea57778b9df14cdcc45291a3fd539e2316383dae526b8693be7df
DIST libp11-0.4.11.tar.gz 500433 BLAKE2B 6a12d8bc0551b3ef11857c0e60a33ebae4f8dfa72c914e9356c13547d71e0f1000ef4b6b7476cfba7cc3376b44b05c2bb0e7a88a267c13702222a7d2b10e9a78 SHA512 37eeeab09cbef7e1498358f2c614f4ec6cb9f37bc9b19e6e393fc0ed3c47ebad8d484b5f5cf428c76ffdf25d08e337d5148d0ff517957283394111dea83352f2
EBUILD libp11-0.4.10.ebuild 785 BLAKE2B 038e6ae02bff3e0f11de2f26871bbd66fd30ff208235c89cfab2d430cf4989ae0c2cd110394f7305d9470695e44b8e6bfa9c70339fbff2eb989d0b1d6b0e19e2 SHA512 0ebef2ac6fb23ca3252e628136cb1c30942e1a01214c94dacc1d02367176ccb3c44afcabb6719cbe1054989188b80aa8b4a738cb15c4ef0f75a887dc09d3cb6d
EBUILD libp11-0.4.11.ebuild 792 BLAKE2B c7e8284ef4f67d1d72aa184594d5ba7a883bec4ab79420c25c1baec9aaaf331134d9e450b3b89ca592029a6f4d1536b6b9ba05d4b312357ebdba0b57b6a18809 SHA512 1e772b0605053409f8442dbde0cd4480a783722507254f2b4d4d3942e65f27fc39ad7f9b2bfb596da5598cc1c6874167de1e8e94535b4b244a2b103632a68da7
EBUILD libp11-0.4.11.ebuild 843 BLAKE2B 88052dc829ad14f64a8c0f3dedc0b0da1edc0e582995df9c37c3d2a9649b7bbc25399146ab80f112882d7556a38c34036a053ccc9822e1acfd75b760116507f5 SHA512 a2a7acb0a5d99e128d26b601dad399010ca69fec60b25f50cb57304b1a6198988c601eb50c69d4cfc1256be5f9f1688730da115300bd389f84151bde37eae633
MISC metadata.xml 688 BLAKE2B b48943e8dfbbacdf23e8ac46500a04daedaf1d518418b87d73887ab8fb0bd660b29f725431c484fda26bf9dedf42bd5a468f2ccc4e0fd275984a934c37630856 SHA512 9b3e84e121b963a5510382d4994d32d5cf4dbdf77ebc7340e4b17dc960034f89c6d3114b011de93c44a97f67433934c293cc6552518e0b5e333f63ad26b709e8

View file

@ -0,0 +1,13 @@
diff -puriN libp11-0.4.11.orig/src/p11_rsa.c libp11-0.4.11/src/p11_rsa.c
--- libp11-0.4.11.orig/src/p11_rsa.c 2020-10-11 08:41:00.000000000 -0500
+++ libp11-0.4.11/src/p11_rsa.c 2021-01-15 06:00:38.000000000 -0600
@@ -336,7 +336,7 @@ int pkcs11_get_key_size(PKCS11_KEY *key)
return RSA_size(rsa);
}
-#if OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100005L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000000L )
int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth))
(int flen, const unsigned char *from,

View file

@ -0,0 +1,34 @@
--- libp11-0.4.10/src/p11_rsa.c 2019-04-03 15:58:18.000000000 -0400
+++ libp11-0.4.10/src/p11_rsa.c 2019-09-30 12:59:51.210016636 -0400
@@ -430,7 +430,7 @@
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100005L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000000L )
static int RSA_meth_set_flags(RSA_METHOD *meth, int flags)
{
--- libp11-0.4.10/src/p11_pkey.c 2018-11-24 03:53:48.000000000 -0500
+++ libp11-0.4.10/src/p11_pkey.c 2019-10-03 21:21:54.406907656 -0400
@@ -90,6 +90,9 @@
unsigned char *tbuf;
} RSA_PKEY_CTX;
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3000100L )
static int EVP_PKEY_CTX_get_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD **pmd)
{
RSA_PKEY_CTX *rctx = EVP_PKEY_CTX_get_data(ctx);
@@ -99,6 +102,10 @@
return 1;
}
+#endif
+
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
+
static int EVP_PKEY_CTX_get_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD **pmd)
{
RSA_PKEY_CTX *rctx = EVP_PKEY_CTX_get_data(ctx);

View file

@ -1,32 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
HOMEPAGE="https://github.com/opensc/libp11/wiki"
SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="libressl bindist doc static-libs"
RDEPEND="
!libressl? ( dev-libs/openssl:0=[bindist=] )
libressl? ( >=dev-libs/libressl-2.8:0= )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
src_configure() {
econf \
--enable-shared \
$(use_enable static-libs static) \
$(use_enable doc api-doc)
}
src_install() {
default
find "${D}" -name '*.la' -delete || die
}

View file

@ -18,6 +18,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
PATCHES="${FILESDIR}/libp11-0.4.11-libressl.patch"
src_configure() {
econf \