forked from pool/openCryptoki
67 lines
2.9 KiB
Diff
67 lines
2.9 KiB
Diff
|
From 20f401a98d5c06648f5dd6ea62aa82f86662d90c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ingo Franzki <ifranzki@linux.ibm.com>
|
||
|
|
Date: Tue, 8 Mar 2022 15:01:24 +0100
|
||
|
|
Subject: [PATCH 2/2] EP11: Fix host library version query
|
||
|
|
|
||
|
|
Look at release and modification level, not just the modification level.
|
||
|
|
Release and modification level are encoded into the one byte minor
|
||
|
|
field of a CK_VERSION. The high order 4 bits are the release number, the
|
||
|
|
low order 4 bits the modification level.
|
||
|
|
|
||
|
|
This allows host library version checks for release and modification levels.
|
||
|
|
|
||
|
|
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
|
||
|
|
---
|
||
|
|
usr/lib/ep11_stdll/ep11_specific.c | 19 ++++++++++++++++---
|
||
|
|
1 file changed, 16 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/usr/lib/ep11_stdll/ep11_specific.c b/usr/lib/ep11_stdll/ep11_specific.c
|
||
|
|
index 4ca9678a..2d7581fa 100644
|
||
|
|
--- a/usr/lib/ep11_stdll/ep11_specific.c
|
||
|
|
+++ b/usr/lib/ep11_stdll/ep11_specific.c
|
||
|
|
@@ -2588,9 +2588,10 @@ CK_RV ep11tok_init(STDLL_TokData_t * tokdata, CK_SLOT_ID SlotNumber,
|
||
|
|
goto error;
|
||
|
|
}
|
||
|
|
|
||
|
|
- TRACE_INFO("%s Host library version: %d.%d\n", __func__,
|
||
|
|
+ TRACE_INFO("%s Host library version: %d.%d.%d\n", __func__,
|
||
|
|
ep11_data->ep11_lib_version.major,
|
||
|
|
- ep11_data->ep11_lib_version.minor);
|
||
|
|
+ (ep11_data->ep11_lib_version.minor & 0xF0) >> 4,
|
||
|
|
+ (ep11_data->ep11_lib_version.minor & 0x0F));
|
||
|
|
|
||
|
|
rc = refresh_target_info(tokdata);
|
||
|
|
if (rc != CKR_OK) {
|
||
|
|
@@ -11289,8 +11290,19 @@ static CK_RV ep11tok_get_ep11_library_version(CK_VERSION *lib_version)
|
||
|
|
rc);
|
||
|
|
return rc;
|
||
|
|
}
|
||
|
|
+ TRACE_DEVEL("%s host_version=0x08%x\n", __func__, host_version);
|
||
|
|
lib_version->major = (host_version & 0x00FF0000) >> 16;
|
||
|
|
- lib_version->minor = host_version & 0x000000FF;
|
||
|
|
+ /* Minor is 4 bits release number and 4 bits modification level */
|
||
|
|
+ lib_version->minor = (host_version & 0x00000F00) >> 4 |
|
||
|
|
+ (host_version & 0x0000000F);
|
||
|
|
+ if ((host_version & 0x0000F000) != 0) {
|
||
|
|
+ lib_version->minor |= 0xF0;
|
||
|
|
+ TRACE_DEVEL("%s relelase > 15, treating as 15\n", __func__);
|
||
|
|
+ }
|
||
|
|
+ if ((host_version & 0x000000F0) != 0) {
|
||
|
|
+ lib_version->minor |= 0x0F;
|
||
|
|
+ TRACE_DEVEL("%s modification level > 15, treating as 15\n", __func__);
|
||
|
|
+ }
|
||
|
|
/*
|
||
|
|
* EP11 host library < v2.0 returns an invalid version (i.e. 0x100). This
|
||
|
|
* can safely be treated as version 1.0
|
||
|
|
@@ -11399,6 +11411,7 @@ CK_RV ep11tok_copy_firmware_info(STDLL_TokData_t *tokdata,
|
||
|
|
if (target_info->card_versions != NULL)
|
||
|
|
pInfo->hardwareVersion = target_info->card_versions->firmware_version;
|
||
|
|
pInfo->firmwareVersion = ep11_data->ep11_lib_version;
|
||
|
|
+ pInfo->firmwareVersion.minor >>= 4; /* report release, skip mod-level */
|
||
|
|
memcpy(pInfo->serialNumber, target_info->serialNumber,
|
||
|
|
sizeof(pInfo->serialNumber));
|
||
|
|
|
||
|
|
--
|
||
|
|
2.16.2.windows.1
|
||
|
|
|