eabdullin
f2618fd0a9
opencryptoki-3.27.0 fails to build on i686 in %build:
usr/lib/common/mech_openssl.c:2766:52: error: passing argument 5 of
'EVP_PKEY_get_octet_string_param' from incompatible pointer type
expected 'size_t *' {aka 'unsigned int *'} but argument is of type
'CK_ULONG *' {aka 'long unsigned int *'}
usr/lib/common/mech_openssl.c:2780:56: error: (likewise)
usr/lib/common/mech_openssl.c:7051:36: error: passing argument 4 of
'openssl_get_key_from_pkey' from incompatible pointer type
CK_ULONG is 'unsigned long' while size_t on ILP32 is 'unsigned int', so
only 32-bit builds break; on LP64 the types coincide. Since GCC 14
-Wincompatible-pointer-types is an error by default.
Both patches are post-v3.27.0 upstream commits (v3.27.0 was tagged
2026-05-13, the fixes landed in June/July 2026), so they are absent from
the 3.27.0-1.el10 import. RHEL 10 does not build i686 and never hit this.
0001 -> 627d27514e7494d36d3d7924e03e4e23ac76bec3
0002 -> ca1ac6235b9d6231578a8487dc441d1ca2a3dfd9
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From ca1ac6235b9d6231578a8487dc441d1ca2a3dfd9 Mon Sep 17 00:00:00 2001
|
|
From: Ingo Franzki <ifranzki@linux.ibm.com>
|
|
Date: Fri, 3 Jul 2026 08:51:49 +0200
|
|
Subject: [PATCH] =?UTF-8?q?Fix=20unused=20variable=20=E2=80=98d=5Fsize?=
|
|
=?UTF-8?q?=E2=80=99=20[-Werror=3Dunused-variable]=20with=20OpenSSL=201.1.?=
|
|
=?UTF-8?q?1?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Move the variable declaration of 'd_size' into the >= OpenSSL 3.0.0 block,
|
|
it is only used when building with OpenSSL >= 3.0.0.
|
|
|
|
Fixes: https://github.com/opencryptoki/opencryptoki/commit/627d27514e7494d36d3d7924e03e4e23ac76bec3
|
|
|
|
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
|
|
---
|
|
usr/lib/common/mech_openssl.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/usr/lib/common/mech_openssl.c b/usr/lib/common/mech_openssl.c
|
|
index 85d7d49ae..b1b70a160 100644
|
|
--- a/usr/lib/common/mech_openssl.c
|
|
+++ b/usr/lib/common/mech_openssl.c
|
|
@@ -2564,10 +2564,11 @@ CK_RV openssl_specific_ec_generate_keypair(STDLL_TokData_t *tokdata,
|
|
#else
|
|
BIGNUM *bn_d = NULL;
|
|
int len;
|
|
+ size_t d_size;
|
|
#endif
|
|
CK_BYTE *ecpoint = NULL, *enc_ecpoint = NULL, *d = NULL;
|
|
CK_ULONG enc_ecpoint_len, d_len;
|
|
- size_t ecpoint_len, d_size;
|
|
+ size_t ecpoint_len;
|
|
EVP_PKEY_CTX *ctx = NULL;
|
|
EVP_PKEY *ec_pkey = NULL;
|
|
int nid, pkey_type;
|