Compare commits
31 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ff2e08964 | ||
|
|
52b2d075c5 | ||
|
|
8bfdd748fd | ||
|
|
65b317ac32 | ||
|
|
d9a08700ec | ||
|
|
f2947b8fb0 | ||
|
|
a1dc894b3c | ||
|
|
89b293d164 | ||
|
|
8dda199d8f | ||
|
|
14c68d0e67 | ||
|
|
4944da931d | ||
|
|
d5c5d15373 | ||
|
|
6767a64473 | ||
|
|
d18ff3e810 | ||
|
|
3f8b5cd0d4 | ||
|
|
1889d564e2 | ||
|
|
ba8b9bd3b5 | ||
|
|
7bf666554b | ||
|
|
ff554a070e | ||
|
|
d143eb64cc | ||
|
|
7e1438d1a8 | ||
|
|
86a391634b | ||
|
|
dd9f683ed3 | ||
|
|
765666d176 | ||
|
|
71c338c3a6 | ||
|
|
4fa919f6c1 | ||
|
|
7d50b40073 | ||
|
|
a0e17dab32 | ||
|
|
e3525f8970 | ||
|
|
02b3e60c31 | ||
|
|
61e85de52c |
6 changed files with 167 additions and 326 deletions
18
.gitignore
vendored
18
.gitignore
vendored
|
|
@ -23,3 +23,21 @@
|
|||
/yubihsm-shell-2.3.2.tar.gz.sig
|
||||
/yubihsm-shell-2.4.0.tar.gz
|
||||
/yubihsm-shell-2.4.0.tar.gz.sig
|
||||
/yubihsm-shell-2.4.1.tar.gz
|
||||
/yubihsm-shell-2.4.1.tar.gz.sig
|
||||
/yubihsm-shell-2.4.2.tar.gz
|
||||
/yubihsm-shell-2.4.2.tar.gz.sig
|
||||
/yubihsm-shell-2.5.0.tar.gz
|
||||
/yubihsm-shell-2.5.0.tar.gz.sig
|
||||
/yubihsm-shell-2.6.0.tar.gz
|
||||
/yubihsm-shell-2.6.0.tar.gz.sig
|
||||
/yubihsm-shell-2.7.0.tar.gz
|
||||
/yubihsm-shell-2.7.0.tar.gz.sig
|
||||
/yubihsm-shell-2.7.1.tar.gz
|
||||
/yubihsm-shell-2.7.1.tar.gz.sig
|
||||
/yubihsm-shell-2.7.2.tar.gz
|
||||
/yubihsm-shell-2.7.2.tar.gz.sig
|
||||
/yubihsm-shell-2.7.3.tar.gz
|
||||
/yubihsm-shell-2.7.3.tar.gz.sig
|
||||
/yubihsm-shell-2.8.0.tar.gz
|
||||
/yubihsm-shell-2.8.0.tar.gz.sig
|
||||
|
|
|
|||
93
changelog
Normal file
93
changelog
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
* Tue Apr 28 2026 Simo Sorce <ssorce@redhat.com> - 2.7.3-2
|
||||
- OpenSSL 4.0 build fixes
|
||||
|
||||
* Thu Apr 16 2026 Jakub Jelen <jjelen@redhat.com> - 2.7.3-1
|
||||
- New upstream release (#2458149)
|
||||
|
||||
* Fri Mar 13 2026 Jakub Jelen <jjelen@redhat.com> - 2.7.2-1
|
||||
- New upstream release (#2447224)
|
||||
|
||||
* Tue Jan 20 2026 Jakub Jelen <jjelen@redhat.com> - 2.7.1-1
|
||||
- New upstream release (#2431274)
|
||||
|
||||
* Tue Jun 17 2025 Jakub Jelen <jjelen@redhat.com> - 2.7.0-1
|
||||
- New upstream release (#2372452)
|
||||
|
||||
* Wed Feb 05 2025 Jakub Jelen <jjelen@redhat.com> - 2.6.0-3
|
||||
- Fix gcc15 warnings (#2341598)
|
||||
|
||||
* Wed Sep 11 2024 Jakub Jelen <jjelen@redhat.com> - 2.6.0-1
|
||||
- New upstream release (#2311424)
|
||||
|
||||
* Tue Jul 30 2024 Jakub Jelen <jjelen@redhat.com> - 2.5.0-4
|
||||
- Fix build against pcsc-lite >= 2.2 (#2301379)
|
||||
|
||||
* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 2.5.0-3
|
||||
- convert license to SPDX
|
||||
|
||||
* Tue Apr 02 2024 Jakub Jelen <jjelen@redhat.com> - 2.5.0-1
|
||||
- New upstream release (#2272123)
|
||||
|
||||
* Wed Nov 08 2023 Jakub Jelen <jjelen@redhat.com> - 2.4.2-1
|
||||
- New upstream release (#2248609)
|
||||
|
||||
* Thu Aug 17 2023 Jakub Jelen <jjelen@redhat.com> - 2.4.1-1
|
||||
- New upstream release (#2232340)
|
||||
|
||||
* Mon Jan 30 2023 Jakub Jelen <jjelen@redhat.com> - 2.4.0-1
|
||||
- New upstream release (#2165239)
|
||||
|
||||
* Mon Jun 27 2022 Jakub Jelen <jjelen@redhat.com> - 2.3.2-1
|
||||
- New upstream release (#2100542)
|
||||
|
||||
* Tue Feb 22 2022 Veronika Hanulikova <vhanulik@redhat.com> - 2.3.1-1
|
||||
- New upstream release (#2050104)
|
||||
|
||||
* Mon Jan 03 2022 Jakub Jelen <jjelen@redhat.com> - 2.3.0b-1
|
||||
- New upstream release (#2035159)
|
||||
|
||||
* Mon Dec 13 2021 Jakub Jelen <jjelen@redhat.com> - 2.3.0-1
|
||||
- New upstream release (#2030694)
|
||||
|
||||
* Thu Nov 18 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-5
|
||||
- Rebuild with deprecated OpenSSL 3.0 functions (#2021878)
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.2.0-4
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Tue Aug 03 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-3
|
||||
- Disable rpath to allow build in Fedora 35 (#1988058)
|
||||
|
||||
* Fri Apr 16 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-1
|
||||
- New upstream release (#1950207)
|
||||
|
||||
* Thu Mar 18 2021 Jakub Jelen <jjelen@redhat.com> - 2.1.0-1
|
||||
- New upstream release (#1936041)
|
||||
|
||||
* Wed Oct 21 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.3-1
|
||||
- New upstream release (#1889941)
|
||||
|
||||
* Thu Aug 06 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-7
|
||||
- Workaround FTBFS on s390x (#1865658)
|
||||
|
||||
* Thu Aug 06 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-6
|
||||
- Rebuild after libz3 soname bump (#1865658)
|
||||
|
||||
* Mon Mar 16 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-3
|
||||
- Avoid warnings/errors with new gcc on s390x (#1800289)
|
||||
|
||||
* Tue Jan 07 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-1
|
||||
- New upstream release (#1772013)
|
||||
|
||||
* Tue Apr 02 2019 Jakub Jelen <jjelen@redhat.com> - 2.0.1-1
|
||||
- New upstream release (#1692935)
|
||||
|
||||
* Wed Feb 13 2019 Jakub Jelen <jjelen@redhat.com> - 2.0.0-4
|
||||
- Workaround unreasonagle error from GCC9 (#1676257)
|
||||
|
||||
* Mon Dec 03 2018 Jakub Jelen <jjelen@redhat.com> - 2.0.0-2
|
||||
- Pull the latest signed tarballs
|
||||
- Address review comments (#1654689)
|
||||
|
||||
* Thu Nov 29 2018 Jakub Jelen <jjelen@redhat.com> - 2.0.0-1
|
||||
- Initial release
|
||||
4
sources
4
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (yubihsm-shell-2.4.0.tar.gz) = 2b08e6e8932ff3bc12d1233d88147264a9875ce145290e29fb6b8f25eeb8e502afff9e7d02714a50454b85b0f01b09c0321d830a483d6b4f7afb962adce882d5
|
||||
SHA512 (yubihsm-shell-2.4.0.tar.gz.sig) = 5c429426023108629144ad691309997f5a08f242eaacb57b941120425dd09372929a38138ec63779d6bd46f334a936d1ca5ddbf33e9603d5f56cfaf6d94e0cab
|
||||
SHA512 (yubihsm-shell-2.8.0.tar.gz) = 9d3153444b3ae71fee344ed81f7b7229d62c5d9b40ebd31e38026c69d36f5a6f92ef411d029861cf2cd33fc1a8689c1ec3576cc076f91e81312795b344da8a58
|
||||
SHA512 (yubihsm-shell-2.8.0.tar.gz.sig) = 77ee4399c7e05d1daed4fd1164f8bacde8e69d69e4bbb6f35fc58a15e212f9455207c529b4f144814ee972e6dd8eb7f3804e7ad15a9d4a853ea187876f5a2630
|
||||
SHA512 (gpgkey-9588EA0F.gpg) = ff3fb773cf95c8d28fb9630c8525539c7ba497a046292a9eda816dd77c4a8b199b74467c7639bbbb0236e439b4db4d0a8b1694a40b33e074072d3ecac46acd87
|
||||
|
|
|
|||
|
|
@ -1,218 +0,0 @@
|
|||
From 4935de246254df236caf8487d15028d05ad88d94 Mon Sep 17 00:00:00 2001
|
||||
From: Per Nilsson <per.nilsson@yubico.com>
|
||||
Date: Fri, 27 Jan 2023 10:09:11 +0100
|
||||
Subject: [PATCH] Fix type of id (#312)
|
||||
|
||||
---
|
||||
pkcs11/util_pkcs11.c | 17 ++++-------------
|
||||
pkcs11/util_pkcs11.h | 4 ++--
|
||||
pkcs11/yubihsm_pkcs11.c | 24 ++++++++----------------
|
||||
3 files changed, 14 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/pkcs11/util_pkcs11.c b/pkcs11/util_pkcs11.c
|
||||
index 5834a5bd..db5f83ca 100644
|
||||
--- a/pkcs11/util_pkcs11.c
|
||||
+++ b/pkcs11/util_pkcs11.c
|
||||
@@ -4294,7 +4294,7 @@ CK_RV parse_hmac_template(CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount,
|
||||
}
|
||||
|
||||
CK_RV parse_meta_id_template(pkcs11_meta_object *pkcs11meta, bool pubkey,
|
||||
- int *id, uint8_t *value, size_t value_len) {
|
||||
+ uint16_t *id, uint8_t *value, size_t value_len) {
|
||||
if (value_len != 2) {
|
||||
if (pubkey) {
|
||||
pkcs11meta->cka_id_pubkey.len = value_len;
|
||||
@@ -4307,10 +4307,6 @@ CK_RV parse_meta_id_template(pkcs11_meta_object *pkcs11meta, bool pubkey,
|
||||
} else {
|
||||
if (!pubkey) {
|
||||
*id = parse_id_value(value, value_len);
|
||||
- if (*id == -1) {
|
||||
- DBG_ERR("CKA_ID invalid in template");
|
||||
- return CKR_ATTRIBUTE_VALUE_INVALID;
|
||||
- }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4343,7 +4339,6 @@ CK_RV parse_rsa_generate_template(CK_ATTRIBUTE_PTR pPublicKeyTemplate,
|
||||
|
||||
uint8_t *e = NULL;
|
||||
CK_RV rv;
|
||||
- int id = 0;
|
||||
|
||||
memset(template->label, 0, sizeof(template->label));
|
||||
for (CK_ULONG i = 0; i < ulPublicKeyAttributeCount; i++) {
|
||||
@@ -4482,14 +4477,13 @@ CK_RV parse_rsa_generate_template(CK_ATTRIBUTE_PTR pPublicKeyTemplate,
|
||||
break;
|
||||
|
||||
case CKA_ID: {
|
||||
- rv = parse_meta_id_template(pkcs11meta, false, &id,
|
||||
+ rv = parse_meta_id_template(pkcs11meta, false, &template->id,
|
||||
pPrivateKeyTemplate[i].pValue,
|
||||
pPrivateKeyTemplate[i].ulValueLen);
|
||||
if (rv != CKR_OK) {
|
||||
DBG_ERR("Failed to parse CKA_ID in PrivateKeyTemplate");
|
||||
return rv;
|
||||
}
|
||||
- template->id = id;
|
||||
} break;
|
||||
|
||||
case CKA_DECRYPT:
|
||||
@@ -4572,7 +4566,7 @@ CK_RV parse_rsa_generate_template(CK_ATTRIBUTE_PTR pPublicKeyTemplate,
|
||||
return CKR_OK;
|
||||
}
|
||||
|
||||
-int parse_id_value(void *value, CK_ULONG len) {
|
||||
+uint16_t parse_id_value(void *value, CK_ULONG len) {
|
||||
switch (len) {
|
||||
case 0:
|
||||
return 0;
|
||||
@@ -4596,7 +4590,6 @@ CK_RV parse_ec_generate_template(CK_ATTRIBUTE_PTR pPublicKeyTemplate,
|
||||
uint8_t *ecparams = NULL;
|
||||
uint16_t ecparams_len = 0;
|
||||
CK_RV rv;
|
||||
- int id;
|
||||
|
||||
memset(template->label, 0, sizeof(template->label));
|
||||
for (CK_ULONG i = 0; i < ulPublicKeyAttributeCount; i++) {
|
||||
@@ -4701,15 +4694,13 @@ CK_RV parse_ec_generate_template(CK_ATTRIBUTE_PTR pPublicKeyTemplate,
|
||||
break;
|
||||
|
||||
case CKA_ID: {
|
||||
- rv = parse_meta_id_template(pkcs11meta, false, &id,
|
||||
+ rv = parse_meta_id_template(pkcs11meta, false, &template->id,
|
||||
pPrivateKeyTemplate[i].pValue,
|
||||
pPrivateKeyTemplate[i].ulValueLen);
|
||||
if (rv != CKR_OK) {
|
||||
DBG_ERR("Failed to parse CKA_ID in PrivateKeyTemplate");
|
||||
return rv;
|
||||
}
|
||||
- template->id = id;
|
||||
-
|
||||
} break;
|
||||
|
||||
case CKA_SIGN:
|
||||
diff --git a/pkcs11/util_pkcs11.h b/pkcs11/util_pkcs11.h
|
||||
index d8026e57..5a91ee34 100644
|
||||
--- a/pkcs11/util_pkcs11.h
|
||||
+++ b/pkcs11/util_pkcs11.h
|
||||
@@ -151,7 +151,7 @@ CK_RV parse_ec_generate_template(CK_ATTRIBUTE_PTR pPublicKeyTemplate,
|
||||
yubihsm_pkcs11_object_template *template,
|
||||
pkcs11_meta_object *pkcs11meta);
|
||||
|
||||
-int parse_id_value(void *value, CK_ULONG len);
|
||||
+uint16_t parse_id_value(void *value, CK_ULONG len);
|
||||
|
||||
CK_RV populate_template(int type, void *object, CK_ATTRIBUTE_PTR pTemplate,
|
||||
CK_ULONG ulCount, yubihsm_pkcs11_session *session);
|
||||
@@ -176,7 +176,7 @@ bool match_meta_attributes(yubihsm_pkcs11_session *session,
|
||||
|
||||
bool is_meta_object(yh_object_descriptor *object);
|
||||
CK_RV parse_meta_id_template(pkcs11_meta_object *pkcs11meta, bool public,
|
||||
- int *id, uint8_t *value, size_t value_len);
|
||||
+ uint16_t *id, uint8_t *value, size_t value_len);
|
||||
void parse_meta_label_template(yubihsm_pkcs11_object_template *template,
|
||||
pkcs11_meta_object *pkcs11meta, bool public,
|
||||
uint8_t *value, size_t value_len);
|
||||
diff --git a/pkcs11/yubihsm_pkcs11.c b/pkcs11/yubihsm_pkcs11.c
|
||||
index 48b3bf46..6f715e01 100644
|
||||
--- a/pkcs11/yubihsm_pkcs11.c
|
||||
+++ b/pkcs11/yubihsm_pkcs11.c
|
||||
@@ -1383,10 +1383,6 @@ CK_DEFINE_FUNCTION(CK_RV, C_CreateObject)
|
||||
id.d = 0;
|
||||
} else {
|
||||
id.d = parse_id_value(pTemplate[i].pValue, pTemplate[i].ulValueLen);
|
||||
- if (id.d == (CK_ULONG) -1) {
|
||||
- rv = CKR_ATTRIBUTE_VALUE_INVALID;
|
||||
- goto c_co_out;
|
||||
- }
|
||||
}
|
||||
id.set = true;
|
||||
} else {
|
||||
@@ -2200,7 +2196,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_SetAttributeValue)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
- int new_id =
|
||||
+ uint16_t new_id =
|
||||
parse_id_value(pTemplate[i].pValue, pTemplate[i].ulValueLen);
|
||||
if (pTemplate[i].ulValueLen != 2 || new_id != object->object.id) {
|
||||
if (object->object.type == YH_PUBLIC_KEY) {
|
||||
@@ -2360,7 +2356,6 @@ CK_DEFINE_FUNCTION(CK_RV, C_FindObjectsInit)
|
||||
|
||||
yh_rc rc = YHR_SUCCESS;
|
||||
|
||||
- int id = 0;
|
||||
uint8_t type = 0;
|
||||
uint16_t domains = 0;
|
||||
yh_capabilities capabilities = {{0}};
|
||||
@@ -2527,7 +2522,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_FindObjectsInit)
|
||||
yh_object_descriptor
|
||||
tmp_objects[YH_MAX_ITEMS_COUNT + MAX_ECDH_SESSION_KEYS] = {0};
|
||||
size_t tmp_n_objects = YH_MAX_ITEMS_COUNT + MAX_ECDH_SESSION_KEYS;
|
||||
- rc = yh_util_list_objects(session->slot->device_session, id, 0, domains,
|
||||
+ rc = yh_util_list_objects(session->slot->device_session, 0, 0, domains,
|
||||
&capabilities, algorithm, label, tmp_objects,
|
||||
&tmp_n_objects);
|
||||
if (rc != YHR_SUCCESS) {
|
||||
@@ -2563,7 +2558,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_FindObjectsInit)
|
||||
} else {
|
||||
yh_object_descriptor tmp_objects[YH_MAX_ITEMS_COUNT] = {0};
|
||||
size_t tmp_n_objects = sizeof(tmp_objects);
|
||||
- rc = yh_util_list_objects(session->slot->device_session, id,
|
||||
+ rc = yh_util_list_objects(session->slot->device_session, 0,
|
||||
YH_OPAQUE, domains, &capabilities,
|
||||
YH_ALGO_OPAQUE_X509_CERTIFICATE, label,
|
||||
tmp_objects, &tmp_n_objects);
|
||||
@@ -2599,7 +2594,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_FindObjectsInit)
|
||||
yh_object_descriptor
|
||||
tmp_objects[YH_MAX_ITEMS_COUNT + MAX_ECDH_SESSION_KEYS] = {0};
|
||||
size_t tmp_n_objects = YH_MAX_ITEMS_COUNT + MAX_ECDH_SESSION_KEYS;
|
||||
- rc = yh_util_list_objects(session->slot->device_session, id, type,
|
||||
+ rc = yh_util_list_objects(session->slot->device_session, 0, type,
|
||||
domains, &capabilities, algorithm, label,
|
||||
tmp_objects, &tmp_n_objects);
|
||||
|
||||
@@ -2636,12 +2631,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_FindObjectsInit)
|
||||
}
|
||||
}
|
||||
|
||||
- id = parse_id_value(template_id, template_id_len);
|
||||
- if (id == -1) {
|
||||
- DBG_ERR("Failed to parse ID from template");
|
||||
- rv = CKR_ATTRIBUTE_VALUE_INVALID;
|
||||
- goto c_foi_out;
|
||||
- }
|
||||
+ uint16_t id = parse_id_value(template_id, template_id_len);
|
||||
DBG_INFO("id parsed as %x", id);
|
||||
|
||||
if (ulCount == 0 ||
|
||||
@@ -4948,12 +4938,14 @@ CK_DEFINE_FUNCTION(CK_RV, C_GenerateKey)
|
||||
|
||||
case CKA_ID:
|
||||
if (id.set == false) {
|
||||
- rv = parse_meta_id_template(&meta_object, FALSE, (int *) &id.d,
|
||||
+ uint16_t d;
|
||||
+ rv = parse_meta_id_template(&meta_object, FALSE, &d,
|
||||
pTemplate[i].pValue,
|
||||
pTemplate[i].ulValueLen);
|
||||
if (rv != CKR_OK) {
|
||||
goto c_gk_out;
|
||||
}
|
||||
+ id.d = d;
|
||||
id.set = true;
|
||||
} else {
|
||||
rv = CKR_TEMPLATE_INCONSISTENT;
|
||||
|
||||
diff --git a/pkcs11/util_pkcs11.c b/pkcs11/util_pkcs11.c
|
||||
index db5f83c..caa467f 100644
|
||||
--- a/pkcs11/util_pkcs11.c
|
||||
+++ b/pkcs11/util_pkcs11.c
|
||||
@@ -2720,7 +2720,7 @@ static CK_RV perform_aes_update(yh_session *session,
|
||||
return rv;
|
||||
}
|
||||
|
||||
- DBG_INFO("Returning %lu bytes (buffered %lu bytes)", size, next);
|
||||
+ DBG_INFO("Returning %zu bytes (buffered %zu bytes)", size, next);
|
||||
*out_len = size;
|
||||
|
||||
return CKR_OK;
|
||||
38
yubihsm-shell-2.5.0-pcsc-lite.patch
Normal file
38
yubihsm-shell-2.5.0-pcsc-lite.patch
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
From 440ba3ad140732ab51bc2df56ae0c82684d02922 Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Jelen <jjelen@redhat.com>
|
||||
Date: Tue, 30 Jul 2024 10:18:02 +0200
|
||||
Subject: [PATCH] cmake: Fix build against pcsc-lite >= 2.2
|
||||
|
||||
The pcsc-lite 2.2.0 switched from autotools to meson and reworked the
|
||||
pkgconfig files. The new pkg config provides CFLAGS that work ok, but
|
||||
the yubihsm-shell ignores them and hopes that all included files are in
|
||||
the default include directory (with the PCSC prefix).
|
||||
|
||||
Note, the value ${LIBPCSC_CFLAGS} is a semicolon separated list which
|
||||
we need to split to separate items here.
|
||||
|
||||
This solution works with both old and new versions.
|
||||
|
||||
Fixes: #404
|
||||
|
||||
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index acbb392..ecf3df8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -194,6 +194,8 @@ if(NOT BUILD_ONLY_LIB)
|
||||
set(LIBPCSC_REQ "Linux" "FreeBSD")
|
||||
if(${CMAKE_SYSTEM_NAME} IN_LIST LIBPCSC_REQ)
|
||||
pkg_search_module (LIBPCSC REQUIRED libpcsclite)
|
||||
+ string (REPLACE ";" " " MY_LIBPCSC_CFLAGS "${LIBPCSC_CFLAGS}")
|
||||
+ string (APPEND CMAKE_C_FLAGS " ${MY_LIBPCSC_CFLAGS}")
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
set (LIBPCSC_LDFLAGS "winscard.lib")
|
||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
%undefine __cmake_in_source_build
|
||||
|
||||
Name: yubihsm-shell
|
||||
Version: 2.4.0
|
||||
Release: 1%{?dist}
|
||||
Version: 2.8.0
|
||||
Release: %autorelease
|
||||
Summary: Tools to interact with YubiHSM 2
|
||||
|
||||
License: ASL 2.0
|
||||
# Automatically converted from old format: ASL 2.0 - review is highly recommended.
|
||||
License: Apache-2.0
|
||||
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/312
|
||||
# https://github.com/Yubico/yubihsm-shell/pull/314
|
||||
Patch1: yubihsm-shell-2.4.0-fix-id-type.patch
|
||||
# https://github.com/Yubico/yubihsm-shell/pull/411
|
||||
Patch2: yubihsm-shell-2.5.0-pcsc-lite.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: cppcheck
|
||||
|
|
@ -28,11 +28,7 @@ BuildRequires: libedit-devel
|
|||
BuildRequires: pcsc-lite-devel
|
||||
BuildRequires: clang
|
||||
BuildRequires: pkg-config
|
||||
%if 0%{fedora} > 36
|
||||
BuildRequires: libusb-compat-0.1-devel
|
||||
%else
|
||||
BuildRequires: libusb-devel
|
||||
%endif
|
||||
BuildRequires: libusb-compat-0.1-devel
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: gnupg2
|
||||
|
||||
|
|
@ -49,8 +45,7 @@ Development libraries for working with yubihsm 2.
|
|||
|
||||
%prep
|
||||
gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%autosetup -p1
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -63,7 +58,11 @@ export CFLAGS="$CFLAGS -Wno-error=format-overflow"
|
|||
%endif
|
||||
# OpenSSL 3.0 deprecates a lot of functions still widely used here
|
||||
export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
|
||||
%cmake -DCMAKE_SKIP_INSTALL_RPATH=ON
|
||||
%cmake -DCMAKE_SKIP_INSTALL_RPATH=ON \
|
||||
%if "%{?_lib}" == "lib64"
|
||||
%{?_cmake_lib_suffix64}
|
||||
%endif
|
||||
%{nil}
|
||||
%cmake_build
|
||||
|
||||
|
||||
|
|
@ -104,99 +103,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/pkcs11/yubihsm_pkcs11.so
|
|||
%dir %{_includedir}/pkcs11
|
||||
%{_includedir}/pkcs11/pkcs11.h
|
||||
%{_includedir}/pkcs11/pkcs11y.h
|
||||
%{_includedir}/pkcs11/pkcs11f.h
|
||||
%{_includedir}/pkcs11/pkcs11t.h
|
||||
%{_datadir}/pkgconfig/yubihsm.pc
|
||||
%{_datadir}/pkgconfig/ykhsmauth.pc
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 30 2023 Jakub Jelen <jjelen@redhat.com> - 2.4.0-1
|
||||
- New upstream release (#2165239)
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 27 2022 Jakub Jelen <jjelen@redhat.com> - 2.3.2-1
|
||||
- New upstream release (#2100542)
|
||||
|
||||
* Tue Feb 22 2022 Veronika Hanulikova <vhanulik@redhat.com> - 2.3.1-1
|
||||
- New upstream release (#2050104)
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0b-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Jan 03 2022 Jakub Jelen <jjelen@redhat.com> - 2.3.0b-1
|
||||
- New upstream release (#2035159)
|
||||
|
||||
* Mon Dec 13 2021 Jakub Jelen <jjelen@redhat.com> - 2.3.0-1
|
||||
- New upstream release (#2030694)
|
||||
|
||||
* Thu Nov 18 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-5
|
||||
- Rebuild with deprecated OpenSSL 3.0 functions (#2021878)
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.2.0-4
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Tue Aug 03 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-3
|
||||
- Disable rpath to allow build in Fedora 35 (#1988058)
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Apr 16 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.0-1
|
||||
- New upstream release (#1950207)
|
||||
|
||||
* Thu Mar 18 2021 Jakub Jelen <jjelen@redhat.com> - 2.1.0-1
|
||||
- New upstream release (#1936041)
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Oct 21 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.3-1
|
||||
- New upstream release (#1889941)
|
||||
|
||||
* Thu Aug 06 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-7
|
||||
- Workaround FTBFS on s390x (#1865658)
|
||||
|
||||
* Thu Aug 06 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-6
|
||||
- Rebuild after libz3 soname bump (#1865658)
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Mar 16 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-3
|
||||
- Avoid warnings/errors with new gcc on s390x (#1800289)
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Jan 07 2020 Jakub Jelen <jjelen@redhat.com> - 2.0.2-1
|
||||
- New upstream release (#1772013)
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Apr 02 2019 Jakub Jelen <jjelen@redhat.com> - 2.0.1-1
|
||||
- New upstream release (#1692935)
|
||||
|
||||
* Wed Feb 13 2019 Jakub Jelen <jjelen@redhat.com> - 2.0.0-4
|
||||
- Workaround unreasonagle error from GCC9 (#1676257)
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Dec 03 2018 Jakub Jelen <jjelen@redhat.com> - 2.0.0-2
|
||||
- Pull the latest signed tarballs
|
||||
- Address review comments (#1654689)
|
||||
|
||||
* Thu Nov 29 2018 Jakub Jelen <jjelen@redhat.com> - 2.0.0-1
|
||||
- Initial release
|
||||
|
||||
|
||||
%autochangelog
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue