From 71c338c3a6ad5c9f9a5e84d3c4ad80b54fb644a0 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Apr 02 2024 08:54:34 +0000 Subject: Fix format string on i686 --- diff --git a/yubihsm-shell-2.5.0-format.patch b/yubihsm-shell-2.5.0-format.patch new file mode 100644 index 0000000..661e0e9 --- /dev/null +++ b/yubihsm-shell-2.5.0-format.patch @@ -0,0 +1,26 @@ +From d93c78f5d91b9bd6dc2e6eda6596ad0659665014 Mon Sep 17 00:00:00 2001 +From: Jakub Jelen +Date: Tue, 2 Apr 2024 10:36:28 +0200 +Subject: [PATCH] pkcs11: Fix format string + +Signed-off-by: Jakub Jelen +--- + pkcs11/yubihsm_pkcs11.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkcs11/yubihsm_pkcs11.c b/pkcs11/yubihsm_pkcs11.c +index f3129df..d195cfe 100644 +--- a/pkcs11/yubihsm_pkcs11.c ++++ b/pkcs11/yubihsm_pkcs11.c +@@ -5667,7 +5667,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_DeriveKey) + ecdh_key.id = ECDH_KEY_TYPE << 16 | seq; + ecdh_key.len = sizeof(ecdh_key.ecdh_key); + +- DBG_INFO("ecdh_key.id = %zu", ecdh_key.id); ++ DBG_INFO("ecdh_key.id = %lu", ecdh_key.id); + + if (value_len > ecdh_key.len) { + DBG_ERR("Requested derived key is too long"); +-- +2.44.0 + diff --git a/yubihsm-shell.spec b/yubihsm-shell.spec index 2d3c70c..8840148 100644 --- a/yubihsm-shell.spec +++ b/yubihsm-shell.spec @@ -10,6 +10,8 @@ URL: https://github.com/Yubico/%{name}/ Source0: https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.gz Source1: https://developers.yubico.com/%{name}/Releases/%{name}-%{version}.tar.gz.sig Source2: gpgkey-9588EA0F.gpg +# https://github.com/Yubico/yubihsm-shell/pull/400 +Patch1: yubihsm-shell-2.5.0-format.patch BuildRequires: cmake BuildRequires: cppcheck @@ -47,6 +49,7 @@ Development libraries for working with yubihsm 2. %prep gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %setup -q +%patch 1 -p1 %build