diff --git a/p11-kit-0.25.3.tar.xz b/p11-kit-0.25.3.tar.xz deleted file mode 100644 index acd60d1..0000000 --- a/p11-kit-0.25.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8ddce1bb7e898986f9d250ccae7c09ce14d82f1009046d202a0eb1b428b2adc -size 991528 diff --git a/p11-kit-0.25.3.tar.xz.sig b/p11-kit-0.25.3.tar.xz.sig deleted file mode 100644 index 517af52..0000000 Binary files a/p11-kit-0.25.3.tar.xz.sig and /dev/null differ diff --git a/p11-kit-0.25.5.tar.xz b/p11-kit-0.25.5.tar.xz new file mode 100644 index 0000000..a0dee56 --- /dev/null +++ b/p11-kit-0.25.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04d0a86450cdb1be018f26af6699857171a188ac6d5b8c90786a60854e1198e5 +size 1002056 diff --git a/p11-kit-0.25.5.tar.xz.sig b/p11-kit-0.25.5.tar.xz.sig new file mode 100644 index 0000000..19132bc Binary files /dev/null and b/p11-kit-0.25.5.tar.xz.sig differ diff --git a/p11-kit-d938f4a8a3a2.patch b/p11-kit-d938f4a8a3a2.patch deleted file mode 100644 index ab0f353..0000000 --- a/p11-kit-d938f4a8a3a2.patch +++ /dev/null @@ -1,106 +0,0 @@ -From d938f4a8a3a2f371e0a3bc1404a384b4b1f61020 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Sat, 2 Dec 2023 09:24:01 +0900 -Subject: [PATCH] import-object: Avoid integer truncation on 32-bit platforms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The build fails when compiling for 32-bit platforms with --Werror=incompatible-pointer-types: - - CFLAGS="-m32 -march=i686 -Werror=incompatible-pointer-types -Werror=implicit -Werror=int-conversion" setarch i686 -- meson setup _build - setarch i686 -- meson compile -C _build -v - ... - - ../p11-kit/import-object.c: In function ‘add_attrs_pubkey_rsa’: - ../p11-kit/import-object.c:223:62: error: passing argument 3 of ‘p11_asn1_read’ from incompatible pointer type [-Werror=incompatible-pointer-types] - 223 | attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); - | ^~~~~~~~~~~~~~~~~~~~~~~~ - | | - | long unsigned int * - -Reported by Sam James in: -https://github.com/p11-glue/p11-kit/issues/608 - -Signed-off-by: Daiki Ueno ---- - p11-kit/import-object.c | 30 +++++++++++++++++++++++++++--- - 1 file changed, 27 insertions(+), 3 deletions(-) - -diff --git a/p11-kit/import-object.c b/p11-kit/import-object.c -index feee0765..fb47b964 100644 ---- a/p11-kit/import-object.c -+++ b/p11-kit/import-object.c -@@ -55,6 +55,7 @@ - #endif - - #include -+#include - #include - #include - #include -@@ -201,6 +202,7 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, - CK_ATTRIBUTE attr_encrypt = { CKA_ENCRYPT, &tval, sizeof (tval) }; - CK_ATTRIBUTE attr_modulus = { CKA_MODULUS, }; - CK_ATTRIBUTE attr_exponent = { CKA_PUBLIC_EXPONENT, }; -+ size_t len = 0; - - pubkey = p11_asn1_read (info, "subjectPublicKey", &pubkey_len); - if (pubkey == NULL) { -@@ -220,17 +222,31 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, - goto cleanup; - } - -- attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); -+ attr_modulus.pValue = p11_asn1_read (asn, "modulus", &len); - if (attr_modulus.pValue == NULL) { - p11_message (_("failed to obtain modulus")); - goto cleanup; - } -+#if ULONG_MAX < SIZE_MAX -+ if (len > ULONG_MAX) { -+ p11_message (_("failed to obtain modulus")); -+ goto cleanup; -+ } -+#endif -+ attr_modulus.ulValueLen = len; - -- attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &attr_exponent.ulValueLen); -+ attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &len); - if (attr_exponent.pValue == NULL) { - p11_message (_("failed to obtain exponent")); - goto cleanup; - } -+#if ULONG_MAX < SIZE_MAX -+ if (len > ULONG_MAX) { -+ p11_message (_("failed to obtain exponent")); -+ goto cleanup; -+ } -+#endif -+ attr_exponent.ulValueLen = len; - - result = p11_attrs_build (attrs, &attr_key_type, &attr_encrypt, &attr_modulus, &attr_exponent, NULL); - if (result == NULL) { -@@ -260,12 +276,20 @@ add_attrs_pubkey_ec (CK_ATTRIBUTE *attrs, - CK_ATTRIBUTE attr_key_type = { CKA_KEY_TYPE, &key_type, sizeof (key_type) }; - CK_ATTRIBUTE attr_ec_params = { CKA_EC_PARAMS, }; - CK_ATTRIBUTE attr_ec_point = { CKA_EC_POINT, }; -+ size_t len = 0; - -- attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &attr_ec_params.ulValueLen); -+ attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &len); - if (attr_ec_params.pValue == NULL) { - p11_message (_("failed to obtain EC parameters")); - goto cleanup; - } -+#if ULONG_MAX < SIZE_MAX -+ if (len > ULONG_MAX) { -+ p11_message (_("failed to obtain EC parameters")); -+ goto cleanup; -+ } -+#endif -+ attr_ec_params.ulValueLen = len; - - /* subjectPublicKey is read as BIT STRING value which contains - * EC point data. We need to DER encode this data as OCTET STRING. diff --git a/p11-kit.changes b/p11-kit.changes index d094b86..550bc6e 100644 --- a/p11-kit.changes +++ b/p11-kit.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Sep 13 07:50:13 UTC 2024 - Pedro Monreal + +- Update to 0.25.5: + * iter: fix recursive attribute loading + * fix building on FreeBSD 14.0 (amd64) + * Remove p11-kit-d938f4a8a3a2.patch upstream + +------------------------------------------------------------------- +Fri Sep 13 07:47:42 UTC 2024 - Pedro Monreal + +- Update to 0.25.4: + * rpc: add support for recursive attributes + * p11-kit: add function to check run-time version of the library + * p11-kit: expose version information through macros + * p11-kit: add option to specify CKA_ID in generate-keypair and + import-object commands + * p11-kit: add --provider option to specify PKCS#11 module when + using p11-kit commands + * p11-kit: fix a bug where eddsa mechanism isn't recognized in + generate-keypair + * p11-kit: fallback to C_GetFunctionList when C_GetInterface + returns CKR_FUNCTION_NOT_SUPPORTED + * bug and build fixes + ------------------------------------------------------------------- Fri Jul 26 15:15:20 UTC 2024 - Martin Jambor diff --git a/p11-kit.spec b/p11-kit.spec index 7b7df07..bdda757 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -21,7 +21,7 @@ %define trustdir_cfg %{pkidir_cfg}/trust %define trustdir_static %{pkidir_static}/trust Name: p11-kit -Version: 0.25.3 +Version: 0.25.5 Release: 0 Summary: Library to work with PKCS#11 modules License: BSD-3-Clause @@ -31,7 +31,6 @@ Source0: https://github.com/p11-glue/%{name}/releases/download/%{version} Source1: https://github.com/p11-glue/%{name}/releases/download/%{version}/p11-kit-%{version}.tar.xz.sig Source98: https://p11-glue.github.io/p11-glue/%{name}/%{name}-release-keyring.gpg#/%{name}.keyring Source99: baselibs.conf -Patch1: p11-kit-d938f4a8a3a2.patch BuildRequires: gtk-doc %if 0%{?suse_version} >= 1600 BuildRequires: libtasn1-tools