mirrors/meta-openembedded
1
0 Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-10-22 08:28:21 +00:00
Code Issues Projects Releases Wiki Activity

pkcs11-provider: upgrade 1.2 -> 1.3.0

Browse Source 
Changelog: https://github.com/openssl-projects/pkcs11-provider/releases/tag/v1.3.0

Here we also drop patch which is now incorporated in the new version,
and align the SRC_URI and HOMEPAGE to match the updated GitHub
organization for the component.

The recipe version numbering is also matched to the upstream scheme
which changed to Major.Minor.Patch since 1.1.

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Niko Mauno authored and Khem Raj committed 2026-10-21 08:13:01 -07:00
1 parent 4ebd174cc1
commit a7329d6625
2 files changed
+3 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

meta-oe/recipes-support/pkcs11-provider/files/0001-Fix-i686-build-failures-in-cipher.c.patch
-62
View File
@@ -1,62 +0,0 @@
From aec4fe7e3c4d18cd5d0f98168df5884a141c6b69 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Thu, 19 Feb 2026 16:08:56 -0500
Subject: [PATCH] Fix i686 build failures in cipher.c
Update AEAD functions to use CK_ULONG pointers for lengths and
introduce a temporary size_t variable for OSSL_PARAM calls. This
corrects pointer type mismatches that caused build failures in
Fedora Rawhide i686 scratch builds.
Upstream-Status: Backport [aec4fe7e3c4d18cd5d0f98168df5884a141c6b69]
Signed-off-by: Simo Sorce <simo@redhat.com>
---
src/cipher.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/cipher.c b/src/cipher.c
index faaa51b..4ccd3ad 100644
--- a/src/cipher.c
+++ b/src/cipher.c
@@ -867,7 +867,7 @@ static CK_RV tls_aead_get_data(CK_MECHANISM_PTR mech, data_buffer *explicitiv,
static CK_RV tls_pre_aead(struct p11prov_cipher_ctx *cctx,
const unsigned char **in, size_t *inl,
- unsigned char **out, size_t *outl)
+ unsigned char **out, CK_ULONG *outl)
{
data_buffer iv = { 0 };
data_buffer tag = { 0 };
@@ -906,7 +906,7 @@ static CK_RV tls_pre_aead(struct p11prov_cipher_ctx *cctx,
}
static CK_RV tls_post_aead(struct p11prov_cipher_ctx *cctx, unsigned char *out,
- size_t *outl)
+ CK_ULONG *outl)
{
data_buffer explicitiv = { 0 };
data_buffer tag = { 0 };
@@ -1475,15 +1475,16 @@ static int p11prov_common_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return RET_OSSL_ERR;
}
- int ret = OSSL_PARAM_get_octet_string(
- p, (void **)&gcm->pIv, gcm->ulIvLen, &gcm->ulIvFixedBits);
+ size_t iv_size;
+ int ret = OSSL_PARAM_get_octet_string(p, (void **)&gcm->pIv,
+ gcm->ulIvLen, &iv_size);
if (ret != RET_OSSL_OK || gcm->pIv == NULL) {
P11PROV_raise(ctx->provctx, CKR_HOST_MEMORY,
"Memory allocation failed");
return RET_OSSL_ERR;
}
- gcm->ulIvFixedBits = BYTES_TO_BITS(gcm->ulIvFixedBits);
+ gcm->ulIvFixedBits = BYTES_TO_BITS(iv_size);
gcm->ivGenerator = CKG_GENERATE_COUNTER;
} else {
P11PROV_raise(ctx->provctx, CKR_MECHANISM_PARAM_INVALID,
--
2.47.3
meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.2.bb → meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.3.0.bb
+3 -5
View File
@@ -6,7 +6,7 @@ the PKCS#11 Cryptographic Token Interface\
This code targets version 3.1 of the interface but should be backwards \
compatible to previous versions as well.\
"
HOMEPAGE = "https://github.com/latchset/pkcs11-provider"
HOMEPAGE = "https://github.com/openssl-projects/pkcs11-provider"
SECTION = "libs"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45"
@@ -15,11 +15,9 @@ DEPENDS = "\
p11-kit \
"
SRCREV = "c7a5c8b62a0ff012b16574f01651254ef7e664ee"
SRCREV = "b55b94344af87a058fd84d6e15390760a5585b1d"
SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https"
SRC_URI += "file://0001-Fix-i686-build-failures-in-cipher.c.patch"
SRC_URI = "git://github.com/openssl-projects/${BPN}.git;branch=main;protocol=https;tag=v${PV}"
inherit meson pkgconfig