Packages
nerves_system_br
1.32.2
1.34.0
1.33.9
1.33.8
1.33.7
1.33.6
1.33.5
1.33.4
1.33.3
1.33.2
1.33.1
1.33.0
1.32.5
1.32.4
1.32.3
1.32.2
1.32.1
1.32.0
1.31.7
1.31.6
1.31.5
1.31.4
1.31.3
1.31.2
1.31.1
1.31.0
1.30.1
1.30.0
1.29.3
1.29.2
1.29.1
1.29.0
1.28.3
1.28.2
1.28.1
1.28.0
1.27.3
1.27.2
1.27.1
1.27.0
1.26.1
1.26.0
1.25.3
1.25.2
1.25.1
1.25.0
1.24.1
1.24.0
1.23.3
1.23.2
1.23.1
1.23.0
1.22.8
1.22.7
1.22.6
1.22.5
1.22.4
1.22.3
1.22.2
1.22.1
1.22.0
1.21.6
1.21.5
1.21.4
1.21.3
1.21.2
1.21.1
1.21.0
1.20.6
1.20.5
1.20.4
1.20.3
1.20.2
1.20.1
1.20.0
1.19.1
1.19.0
1.18.6
1.18.5
1.18.4
1.18.3
1.18.2
1.18.1
1.18.0
1.17.4
1.17.3
1.17.2
1.17.1
1.17.0
1.16.5
1.16.4
1.16.3
1.16.2
1.16.1
1.16.0
1.15.2
1.15.1
1.15.0
1.14.5
1.14.4
1.14.3
1.14.2
1.14.1
1.14.0
1.13.8
1.13.7
1.13.6
1.13.5
1.13.4
1.13.3
1.13.2
1.13.1
1.13.0
1.12.4
1.12.3
1.12.2
1.12.1
1.12.0
1.12.0-rc.0
1.11.4
1.11.3
1.11.2
1.11.1
1.11.0
1.10.3
1.10.2
1.10.1
1.10.0
1.9.5
1.9.4
1.9.3
1.9.2
1.9.1
1.9.0
1.8.6
1.8.5
1.8.4
1.8.3
1.8.2
1.8.1
1.8.0
1.7.3
1.7.2
1.7.1
1.7.0
1.6.8
1.6.7
1.6.6
1.6.5
1.6.4
1.6.3
1.6.2
1.6.1
1.6.0
1.5.6
1.5.5
1.5.4
1.5.3
1.5.2
1.5.1
1.5.0
1.4.5
1.4.4
1.4.3
1.4.2
1.4.1
1.4.0
1.3.2
1.3.1
1.3.0
1.2.2
1.2.1
1.2.0
1.1.0
1.0.1
1.0.0
1.0.0-rc.4
1.0.0-rc.3
1.0.0-rc.2
1.0.0-rc.1
1.0.0-rc.0
0.17.0
0.16.4
0.16.3
0.16.2
0.16.1-2017-11
0.16.0-2017-11
0.15.1
0.15.0
0.14.1
0.14.0
0.13.9
0.13.8
0.13.7
0.13.6
0.13.5
0.13.4
retired
0.13.3
0.13.2
0.13.0
0.12.1
0.12.0
0.11.1
0.11.0
0.10.1
0.10.0
0.9.4
0.9.3
0.9.2
0.9.1
0.9.0
0.8.2
0.8.1
0.8.0
0.7.0
0.6.1
0.6.0
0.5.2
0.5.1
0.5.0
0.4.2
0.4.1
Nerves System BR - Buildroot based build platform for Nerves Systems
Current section
Files
Jump to
Current section
Files
patches/buildroot/0010-Revert-package-libp11-bump-to-version-0.4.12.patch
From ba58e20cfaef4d542755888a17d29d339dcebcf2 Mon Sep 17 00:00:00 2001
From: Frank Hunleth <fhunleth@troodon-software.com>
Date: Sun, 11 Sep 2022 08:18:28 -0400
Subject: [PATCH] Revert "package/libp11: bump to version 0.4.12"
This reverts commit ecf8efb292fb410ab8080891fb017d4a01ef3cd5.
---
package/libp11/0001-Update-wp11_rsa.c.patch | 26 +++++++
...rc-p11_attr.c-fix-build-with-gcc-4.8.patch | 42 ------------
...ange-bool-attribute-true-false-names.patch | 67 -------------------
package/libp11/libp11.hash | 2 +-
package/libp11/libp11.mk | 2 +-
5 files changed, 28 insertions(+), 111 deletions(-)
create mode 100644 package/libp11/0001-Update-wp11_rsa.c.patch
delete mode 100644 package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch
delete mode 100644 package/libp11/0002-change-bool-attribute-true-false-names.patch
diff --git a/package/libp11/0001-Update-wp11_rsa.c.patch b/package/libp11/0001-Update-wp11_rsa.c.patch
new file mode 100644
index 0000000000..0a2d6e65ce
--- /dev/null
+++ b/package/libp11/0001-Update-wp11_rsa.c.patch
@@ -0,0 +1,26 @@
+From 4968cfc64dbaa39bb479a24d9578d75099e2f337 Mon Sep 17 00:00:00 2001
+From: patchMonkey156 <pagorman@asu.edu>
+Date: Mon, 19 Oct 2020 17:12:15 -0400
+Subject: [PATCH] Update p11_rsa.c
+
+Bugfix for new LibreSSL version 3.2.2
+[Retrieved from:
+https://github.com/OpenSC/libp11/commit/4968cfc64dbaa39bb479a24d9578d75099e2f337]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/p11_rsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/p11_rsa.c b/src/p11_rsa.c
+index b6beef0..ff12ed7 100644
+--- a/src/p11_rsa.c
++++ b/src/p11_rsa.c
+@@ -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 ( ( defined (OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100005L ) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3020199L ) )
+
+ int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth))
+ (int flen, const unsigned char *from,
diff --git a/package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch b/package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch
deleted file mode 100644
index 60fc16d9d0..0000000000
--- a/package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ba44b87318ed89e489fa3ce0a5d66002afa2bd6c Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 12 Aug 2022 11:54:54 +0200
-Subject: [PATCH] src/p11_attr.c: fix build with gcc 4.8
-
-Fix the following build failure with gcc 4.8 raised since version 0.4.12
-and
-https://github.com/OpenSC/libp11/commit/639a4b6463278c0119a2ec60b261da3e5330fb33:
-
-p11_attr.c: In function 'pkcs11_zap_attrs':
-p11_attr.c:167:2: error: 'for' loop initial declarations are only allowed in C99 mode
- for (unsigned i = 0; i < 32; i++) {
- ^
-p11_attr.c:167:2: note: use option -std=c99 or -std=gnu99 to compile your code
-
-Fixes:
- - http://autobuild.buildroot.org/results/4391020fb5738cc8c26dc53783a6228bbf76473a
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/OpenSC/libp11/commit/ba44b87318ed89e489fa3ce0a5d66002afa2bd6c]
----
- src/p11_attr.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/p11_attr.c b/src/p11_attr.c
-index d49456ff..d425241a 100644
---- a/src/p11_attr.c
-+++ b/src/p11_attr.c
-@@ -162,9 +162,11 @@ void pkcs11_addattr_obj(PKCS11_TEMPLATE *tmpl, int type, pkcs11_i2d_fn enc, void
-
- void pkcs11_zap_attrs(PKCS11_TEMPLATE *tmpl)
- {
-+ unsigned int i;
-+
- if (!tmpl->allocated)
- return;
-- for (unsigned i = 0; i < 32; i++) {
-+ for (i = 0; i < 32; i++) {
- if (tmpl->allocated & (1<<i))
- OPENSSL_free(tmpl->attrs[i].pValue);
- }
diff --git a/package/libp11/0002-change-bool-attribute-true-false-names.patch b/package/libp11/0002-change-bool-attribute-true-false-names.patch
deleted file mode 100644
index d63ec74590..0000000000
--- a/package/libp11/0002-change-bool-attribute-true-false-names.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 89ccb1f097f56a0933f881af051422b8d67e457f Mon Sep 17 00:00:00 2001
-From: dlegault <dlegault@blackberry.com>
-Date: Fri, 2 Sep 2022 12:01:23 -0400
-Subject: [PATCH] Change bool attribute true/false names to _true/_false
-
-This prevents conflicts with true/false defined in stdbool.h
-
-fixes #472
-
-Upstream: https://github.com/OpenSC/libp11/commit/89ccb1f097f56a0933f881af051422b8d67e457f
-Signed-off-by: Thomas Perale <thomas.perale@mind.be>
----
- src/p11_attr.c | 6 +++---
- src/p11_ec.c | 14 +++++++-------
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/p11_attr.c b/src/p11_attr.c
-index d425241a..a420efad 100644
---- a/src/p11_attr.c
-+++ b/src/p11_attr.c
-@@ -123,9 +123,9 @@ unsigned int pkcs11_addattr(PKCS11_TEMPLATE *tmpl, int type, void *data, size_t
-
- void pkcs11_addattr_bool(PKCS11_TEMPLATE *tmpl, int type, int value)
- {
-- static CK_BBOOL true = CK_TRUE;
-- static CK_BBOOL false = CK_FALSE;
-- pkcs11_addattr(tmpl, type, value ? &true : &false, sizeof(CK_BBOOL));
-+ static CK_BBOOL _true = CK_TRUE;
-+ static CK_BBOOL _false = CK_FALSE;
-+ pkcs11_addattr(tmpl, type, value ? &_true : &_false, sizeof(CK_BBOOL));
- }
-
- void pkcs11_addattr_s(PKCS11_TEMPLATE *tmpl, int type, const char *s)
-diff --git a/src/p11_ec.c b/src/p11_ec.c
-index 4fb4efc3..16e3b3af 100644
---- a/src/p11_ec.c
-+++ b/src/p11_ec.c
-@@ -590,22 +590,22 @@ static int pkcs11_ecdh_derive(unsigned char **out, size_t *outlen,
- CK_MECHANISM mechanism;
- int rv;
-
-- CK_BBOOL true = TRUE;
-- CK_BBOOL false = FALSE;
-+ CK_BBOOL _true = TRUE;
-+ CK_BBOOL _false = FALSE;
- CK_OBJECT_HANDLE newkey = CK_INVALID_HANDLE;
- CK_OBJECT_CLASS newkey_class= CKO_SECRET_KEY;
- CK_KEY_TYPE newkey_type = CKK_GENERIC_SECRET;
- CK_ULONG newkey_len = key_len;
- CK_OBJECT_HANDLE *tmpnewkey = (CK_OBJECT_HANDLE *)outnewkey;
- CK_ATTRIBUTE newkey_template[] = {
-- {CKA_TOKEN, &false, sizeof(false)}, /* session only object */
-+ {CKA_TOKEN, &_false, sizeof(_false)}, /* session only object */
- {CKA_CLASS, &newkey_class, sizeof(newkey_class)},
- {CKA_KEY_TYPE, &newkey_type, sizeof(newkey_type)},
- {CKA_VALUE_LEN, &newkey_len, sizeof(newkey_len)},
-- {CKA_SENSITIVE, &false, sizeof(false) },
-- {CKA_EXTRACTABLE, &true, sizeof(true) },
-- {CKA_ENCRYPT, &true, sizeof(true)},
-- {CKA_DECRYPT, &true, sizeof(true)}
-+ {CKA_SENSITIVE, &_false, sizeof(_false) },
-+ {CKA_EXTRACTABLE, &_true, sizeof(_true) },
-+ {CKA_ENCRYPT, &_true, sizeof(_true)},
-+ {CKA_DECRYPT, &_true, sizeof(_true)}
- };
-
- memset(&mechanism, 0, sizeof(mechanism));
diff --git a/package/libp11/libp11.hash b/package/libp11/libp11.hash
index 0e42bdd4cf..52d73d4206 100644
--- a/package/libp11/libp11.hash
+++ b/package/libp11/libp11.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 1e1a2533b3fcc45fde4da64c9c00261b1047f14c3f911377ebd1b147b3321cfd libp11-0.4.12.tar.gz
+sha256 57d47a12a76fd92664ae30032cf969284ebac1dfc25bf824999d74b016d51366 libp11-0.4.11.tar.gz
sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING
diff --git a/package/libp11/libp11.mk b/package/libp11/libp11.mk
index cd4ed34297..45a718ee99 100644
--- a/package/libp11/libp11.mk
+++ b/package/libp11/libp11.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBP11_VERSION = 0.4.12
+LIBP11_VERSION = 0.4.11
LIBP11_SITE = https://github.com/OpenSC/libp11/releases/download/libp11-$(LIBP11_VERSION)
LIBP11_DEPENDENCIES = openssl host-pkgconf
LIBP11_INSTALL_STAGING = YES
--
2.43.0