|
1 | | -From 2a7391dd5b9d50cf7c071bdc342cb04ebdea1c11 Mon Sep 17 00:00:00 2001 |
| 1 | +From c9172581a635293b49319eaf7ab26edfe5fe2798 Mon Sep 17 00:00:00 2001 |
2 | 2 | From: Frank Hunleth < [email protected]> |
3 | 3 | Date: Sun, 11 Sep 2022 08:18:28 -0400 |
4 | 4 | Subject: [PATCH] Revert "package/libp11: bump to version 0.4.12" |
5 | 5 |
|
6 | 6 | This reverts commit ecf8efb292fb410ab8080891fb017d4a01ef3cd5. |
7 | 7 | --- |
8 | | - package/libp11/0001-Update-wp11_rsa.c.patch | 26 ++++++++++++ |
9 | | - ...rc-p11_attr.c-fix-build-with-gcc-4.8.patch | 42 ------------------- |
| 8 | + package/libp11/0001-Update-wp11_rsa.c.patch | 26 +++++++ |
| 9 | + ...rc-p11_attr.c-fix-build-with-gcc-4.8.patch | 42 ------------ |
| 10 | + ...ange-bool-attribute-true-false-names.patch | 67 ------------------- |
10 | 11 | package/libp11/libp11.hash | 2 +- |
11 | 12 | package/libp11/libp11.mk | 2 +- |
12 | | - 4 files changed, 28 insertions(+), 44 deletions(-) |
| 13 | + 5 files changed, 28 insertions(+), 111 deletions(-) |
13 | 14 | create mode 100644 package/libp11/0001-Update-wp11_rsa.c.patch |
14 | 15 | delete mode 100644 package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch |
| 16 | + delete mode 100644 package/libp11/0002-change-bool-attribute-true-false-names.patch |
15 | 17 |
|
16 | 18 | diff --git a/package/libp11/0001-Update-wp11_rsa.c.patch b/package/libp11/0001-Update-wp11_rsa.c.patch |
17 | 19 | new file mode 100644 |
@@ -93,6 +95,79 @@ index 60fc16d9d0..0000000000 |
93 | 95 | - if (tmpl->allocated & (1<<i)) |
94 | 96 | - OPENSSL_free(tmpl->attrs[i].pValue); |
95 | 97 | - } |
| 98 | +diff --git a/package/libp11/0002-change-bool-attribute-true-false-names.patch b/package/libp11/0002-change-bool-attribute-true-false-names.patch |
| 99 | +deleted file mode 100644 |
| 100 | +index d63ec74590..0000000000 |
| 101 | +--- a/package/libp11/0002-change-bool-attribute-true-false-names.patch |
| 102 | ++++ /dev/null |
| 103 | +@@ -1,67 +0,0 @@ |
| 104 | +-From 89ccb1f097f56a0933f881af051422b8d67e457f Mon Sep 17 00:00:00 2001 |
| 105 | +-From: dlegault <[email protected]> |
| 106 | +-Date: Fri, 2 Sep 2022 12:01:23 -0400 |
| 107 | +-Subject: [PATCH] Change bool attribute true/false names to _true/_false |
| 108 | +- |
| 109 | +-This prevents conflicts with true/false defined in stdbool.h |
| 110 | +- |
| 111 | +-fixes #472 |
| 112 | +- |
| 113 | +-Upstream: https://github.com/OpenSC/libp11/commit/89ccb1f097f56a0933f881af051422b8d67e457f |
| 114 | +-Signed-off-by: Thomas Perale <[email protected]> |
| 115 | +---- |
| 116 | +- src/p11_attr.c | 6 +++--- |
| 117 | +- src/p11_ec.c | 14 +++++++------- |
| 118 | +- 2 files changed, 10 insertions(+), 10 deletions(-) |
| 119 | +- |
| 120 | +-diff --git a/src/p11_attr.c b/src/p11_attr.c |
| 121 | +-index d425241a..a420efad 100644 |
| 122 | +---- a/src/p11_attr.c |
| 123 | +-+++ b/src/p11_attr.c |
| 124 | +-@@ -123,9 +123,9 @@ unsigned int pkcs11_addattr(PKCS11_TEMPLATE *tmpl, int type, void *data, size_t |
| 125 | +- |
| 126 | +- void pkcs11_addattr_bool(PKCS11_TEMPLATE *tmpl, int type, int value) |
| 127 | +- { |
| 128 | +-- static CK_BBOOL true = CK_TRUE; |
| 129 | +-- static CK_BBOOL false = CK_FALSE; |
| 130 | +-- pkcs11_addattr(tmpl, type, value ? &true : &false, sizeof(CK_BBOOL)); |
| 131 | +-+ static CK_BBOOL _true = CK_TRUE; |
| 132 | +-+ static CK_BBOOL _false = CK_FALSE; |
| 133 | +-+ pkcs11_addattr(tmpl, type, value ? &_true : &_false, sizeof(CK_BBOOL)); |
| 134 | +- } |
| 135 | +- |
| 136 | +- void pkcs11_addattr_s(PKCS11_TEMPLATE *tmpl, int type, const char *s) |
| 137 | +-diff --git a/src/p11_ec.c b/src/p11_ec.c |
| 138 | +-index 4fb4efc3..16e3b3af 100644 |
| 139 | +---- a/src/p11_ec.c |
| 140 | +-+++ b/src/p11_ec.c |
| 141 | +-@@ -590,22 +590,22 @@ static int pkcs11_ecdh_derive(unsigned char **out, size_t *outlen, |
| 142 | +- CK_MECHANISM mechanism; |
| 143 | +- int rv; |
| 144 | +- |
| 145 | +-- CK_BBOOL true = TRUE; |
| 146 | +-- CK_BBOOL false = FALSE; |
| 147 | +-+ CK_BBOOL _true = TRUE; |
| 148 | +-+ CK_BBOOL _false = FALSE; |
| 149 | +- CK_OBJECT_HANDLE newkey = CK_INVALID_HANDLE; |
| 150 | +- CK_OBJECT_CLASS newkey_class= CKO_SECRET_KEY; |
| 151 | +- CK_KEY_TYPE newkey_type = CKK_GENERIC_SECRET; |
| 152 | +- CK_ULONG newkey_len = key_len; |
| 153 | +- CK_OBJECT_HANDLE *tmpnewkey = (CK_OBJECT_HANDLE *)outnewkey; |
| 154 | +- CK_ATTRIBUTE newkey_template[] = { |
| 155 | +-- {CKA_TOKEN, &false, sizeof(false)}, /* session only object */ |
| 156 | +-+ {CKA_TOKEN, &_false, sizeof(_false)}, /* session only object */ |
| 157 | +- {CKA_CLASS, &newkey_class, sizeof(newkey_class)}, |
| 158 | +- {CKA_KEY_TYPE, &newkey_type, sizeof(newkey_type)}, |
| 159 | +- {CKA_VALUE_LEN, &newkey_len, sizeof(newkey_len)}, |
| 160 | +-- {CKA_SENSITIVE, &false, sizeof(false) }, |
| 161 | +-- {CKA_EXTRACTABLE, &true, sizeof(true) }, |
| 162 | +-- {CKA_ENCRYPT, &true, sizeof(true)}, |
| 163 | +-- {CKA_DECRYPT, &true, sizeof(true)} |
| 164 | +-+ {CKA_SENSITIVE, &_false, sizeof(_false) }, |
| 165 | +-+ {CKA_EXTRACTABLE, &_true, sizeof(_true) }, |
| 166 | +-+ {CKA_ENCRYPT, &_true, sizeof(_true)}, |
| 167 | +-+ {CKA_DECRYPT, &_true, sizeof(_true)} |
| 168 | +- }; |
| 169 | +- |
| 170 | +- memset(&mechanism, 0, sizeof(mechanism)); |
96 | 171 | diff --git a/package/libp11/libp11.hash b/package/libp11/libp11.hash |
97 | 172 | index 0e42bdd4cf..52d73d4206 100644 |
98 | 173 | --- a/package/libp11/libp11.hash |
|
0 commit comments