drop patch now included. Signed-off-by: Armin Kuster <[email protected]> --- .../recipes-tpm2/tpm2-pkcs11/files/677.patch | 295 ------------------ ...2-pkcs11_1.6.0.bb => tpm2-pkcs11_1.7.0.bb} | 3 +- 2 files changed, 1 insertion(+), 297 deletions(-) delete mode 100644 meta-tpm/recipes-tpm2/tpm2-pkcs11/files/677.patch rename meta-tpm/recipes-tpm2/tpm2-pkcs11/{tpm2-pkcs11_1.6.0.bb => tpm2-pkcs11_1.7.0.bb} (95%)
diff --git a/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/677.patch b/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/677.patch deleted file mode 100644 index 5c91a5e..0000000 --- a/meta-tpm/recipes-tpm2/tpm2-pkcs11/files/677.patch +++ /dev/null @@ -1,295 +0,0 @@ -From 2b74d3df9b3b6932052ace627b21ff1352aa2932 Mon Sep 17 00:00:00 2001 -From: William Roberts <[email protected]> -Date: Wed, 5 May 2021 13:32:05 -0500 -Subject: [PATCH 1/4] test: fix build for gcc11 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes 0 size regions by ignoring them. The test code intentionally does -bad things. - -test/unit/test_twist.c: In function ‘test_twistbin_aappend_twist_null’: -test/unit/test_twist.c:327:18: error: ‘twistbin_aappend’ accessing 16 bytes in a region of size 0 [-Werror=stringop-overflow=] - 327 | actual = twistbin_aappend(expected, (binarybuffer *) 0xDEADBEEF, 0); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: William Roberts <[email protected]> - -Upstream-Status: Pending -Fix out for merge to offical repo - -Signed-off-by: Armin Kuster <[email protected]> - ---- - test/unit/test_twist.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/test/unit/test_twist.c b/test/unit/test_twist.c -index ec66f69f..58d4530a 100644 ---- a/test/unit/test_twist.c -+++ b/test/unit/test_twist.c -@@ -244,15 +244,23 @@ void test_twistbin_create(void **state) { - void test_twistbin_new_overflow_1(void **state) { - (void) state; - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wpragmas" -+#pragma GCC diagnostic ignored "-Wstringop-overflow" - twist actual = twistbin_new((void *) 0xDEADBEEF, ~0); - assert_null(actual); -+#pragma GCC diagnostic pop - } - - void test_twistbin_new_overflow_2(void **state) { - (void) state; - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wpragmas" -+#pragma GCC diagnostic ignored "-Wstringop-overflow" - twist actual = twistbin_new((void *) 0xDEADBEEF, ~0 - sizeof(void *)); - assert_null(actual); -+#pragma GCC diagnostic pop - } - - void test_twistbin_new_overflow_3(void **state) { -@@ -318,8 +326,12 @@ void test_twistbin_aappend_twist_null(void **state) { - twist actual = twistbin_aappend(expected, NULL, 42); - assert_ptr_equal((void * )actual, (void * )expected); - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wpragmas" -+#pragma GCC diagnostic ignored "-Wstringop-overflow" - actual = twistbin_aappend(expected, (binarybuffer *) 0xDEADBEEF, 0); - assert_ptr_equal((void * )actual, (void * )expected); -+#pragma GCC diagnostic pop - - twist_free(actual); - } - -From 5bea05613e638375b73e29e5d56a9dabcfd2269d Mon Sep 17 00:00:00 2001 -From: William Roberts <[email protected]> -Date: Wed, 5 May 2021 11:52:23 -0500 -Subject: [PATCH 2/4] utils: fix stringop-overread in str_padded_copy - -cc1: all warnings being treated as errors -| make: *** [Makefile:1953: src/lib/slot.lo] Error 1 -| make: *** Waiting for unfinished jobs.... -| In file included from src/lib/mutex.h:10, -| from src/lib/session_ctx.h:6, -| from src/lib/digest.h:13, -| from src/lib/tpm.c:28: -| In function 'str_padded_copy', -| inlined from 'tpm_get_token_info' at src/lib/tpm.c:742:5: -| src/lib/utils.h:42:5: error: 'strnlen' specified bound 32 exceeds source size 5 [-Werror=stringop-overread] -| 42 | memcpy(dst, src, strnlen((char *)(src), dst_len)); -| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| src/lib/utils.h: In function 'tpm_get_token_info': -| src/lib/tpm.c:739:19: note: source object declared here -| 739 | unsigned char manufacturerID[sizeof(UINT32)+1] = {0}; // 4 bytes + '\0' as temp storage -| | ^~~~~~~~~~~~~~ -| cc1: all warnings being treated as errors -| make: *** [Makefile:1953: src/lib/tpm.lo] Error 1 -| WARNING: exit code 1 from a shell command. - -Fixes #676 - -Signed-off-by: William Roberts <[email protected]> ---- - src/lib/general.c | 8 ++++---- - src/lib/general.h | 2 +- - src/lib/slot.c | 4 ++-- - src/lib/token.c | 4 ++-- - src/lib/tpm.c | 7 +++---- - src/lib/utils.h | 6 ++++-- - 6 files changed, 16 insertions(+), 15 deletions(-) - -diff --git a/src/lib/general.c b/src/lib/general.c -index 9b7327c1..eaddaf82 100644 ---- a/src/lib/general.c -+++ b/src/lib/general.c -@@ -19,8 +19,8 @@ - #define VERSION "UNKNOWN" - #endif - --#define LIBRARY_DESCRIPTION (CK_UTF8CHAR_PTR)"TPM2.0 Cryptoki" --#define LIBRARY_MANUFACTURER (CK_UTF8CHAR_PTR)"tpm2-software.github.io" -+static const CK_UTF8CHAR LIBRARY_DESCRIPTION[] = "TPM2.0 Cryptoki"; -+static const CK_UTF8CHAR LIBRARY_MANUFACTURER[] = "tpm2-software.github.io"; - - #define CRYPTOKI_VERSION { \ - .major = CRYPTOKI_VERSION_MAJOR, \ -@@ -78,8 +78,8 @@ CK_RV general_get_info(CK_INFO *info) { - - static CK_INFO *_info = NULL; - if (!_info) { -- str_padded_copy(_info_.manufacturerID, LIBRARY_MANUFACTURER, sizeof(_info_.manufacturerID)); -- str_padded_copy(_info_.libraryDescription, LIBRARY_DESCRIPTION, sizeof(_info_.libraryDescription)); -+ str_padded_copy(_info_.manufacturerID, LIBRARY_MANUFACTURER); -+ str_padded_copy(_info_.libraryDescription, LIBRARY_DESCRIPTION); - - parse_lib_version(&_info_.libraryVersion.major, - &_info_.libraryVersion.minor); -diff --git a/src/lib/general.h b/src/lib/general.h -index 14a18e46..356c142d 100644 ---- a/src/lib/general.h -+++ b/src/lib/general.h -@@ -10,7 +10,7 @@ - #define TPM2_TOKEN_LABEL "TPM2 PKCS#11 Token" - #define TPM2_TOKEN_MANUFACTURER "Intel" - #define TPM2_TOKEN_MODEL "TPM2 PKCS#11" --#define TPM2_TOKEN_SERIAL_NUMBER "0000000000000000" -+static const CK_UTF8CHAR TPM2_TOKEN_SERIAL_NUMBER[] = "0000000000000000"; - #define TPM2_TOKEN_HW_VERSION { 0, 0 } - #define TPM2_TOKEN_FW_VERSION { 0, 0 } - -diff --git a/src/lib/slot.c b/src/lib/slot.c -index 548d22b5..6db5bb93 100644 ---- a/src/lib/slot.c -+++ b/src/lib/slot.c -@@ -119,8 +119,8 @@ CK_RV slot_get_info (CK_SLOT_ID slot_id, CK_SLOT_INFO *info) { - return CKR_GENERAL_ERROR; - } - -- str_padded_copy(info->manufacturerID, token_info.manufacturerID, sizeof(info->manufacturerID)); -- str_padded_copy(info->slotDescription, token_info.label, sizeof(info->slotDescription)); -+ str_padded_copy(info->manufacturerID, token_info.manufacturerID); -+ str_padded_copy(info->slotDescription, token_info.label); - - info->hardwareVersion = token_info.hardwareVersion; - info->firmwareVersion = token_info.firmwareVersion; -diff --git a/src/lib/token.c b/src/lib/token.c -index 6d7ebd27..c7211296 100644 ---- a/src/lib/token.c -+++ b/src/lib/token.c -@@ -317,8 +317,8 @@ CK_RV token_get_info (token *t, CK_TOKEN_INFO *info) { - } - - // Identification -- str_padded_copy(info->label, t->label, sizeof(info->label)); -- str_padded_copy(info->serialNumber, (unsigned char*) TPM2_TOKEN_SERIAL_NUMBER, sizeof(info->serialNumber)); -+ str_padded_copy(info->label, t->label); -+ str_padded_copy(info->serialNumber, TPM2_TOKEN_SERIAL_NUMBER); - - - // Memory: TODO not sure what memory values should go here, the platform? -diff --git a/src/lib/tpm.c b/src/lib/tpm.c -index 1639df48..7f9f052a 100644 ---- a/src/lib/tpm.c -+++ b/src/lib/tpm.c -@@ -740,15 +740,14 @@ CK_RV tpm_get_token_info (tpm_ctx *ctx, CK_TOKEN_INFO *info) { - unsigned char manufacturerID[sizeof(UINT32)+1] = {0}; // 4 bytes + '\0' as temp storage - UINT32 manufacturer = ntohl(tpmProperties[TPM2_PT_MANUFACTURER - TPM2_PT_FIXED].value); - memcpy(manufacturerID, (unsigned char*) &manufacturer, sizeof(uint32_t)); -- str_padded_copy(info->manufacturerID, manufacturerID, sizeof(info->manufacturerID)); -+ str_padded_copy(info->manufacturerID, manufacturerID); - - // Map human readable Manufacturer String, if available, - // otherwise 4 byte ID was already padded and will be used. - for (unsigned int i=0; i < ARRAY_LEN(TPM2_MANUFACTURER_MAP); i++){ - if (!strncasecmp((char *)info->manufacturerID, TPM2_MANUFACTURER_MAP[i][0], 4)) { - str_padded_copy(info->manufacturerID, -- (unsigned char *)TPM2_MANUFACTURER_MAP[i][1], -- sizeof(info->manufacturerID)); -+ (unsigned char *)TPM2_MANUFACTURER_MAP[i][1]); - } - } - -@@ -758,7 +757,7 @@ CK_RV tpm_get_token_info (tpm_ctx *ctx, CK_TOKEN_INFO *info) { - vendor[1] = ntohl(tpmProperties[TPM2_PT_VENDOR_STRING_2 - TPM2_PT_FIXED].value); - vendor[2] = ntohl(tpmProperties[TPM2_PT_VENDOR_STRING_3 - TPM2_PT_FIXED].value); - vendor[3] = ntohl(tpmProperties[TPM2_PT_VENDOR_STRING_4 - TPM2_PT_FIXED].value); -- str_padded_copy(info->model, (unsigned char*) &vendor, sizeof(info->model)); -+ str_padded_copy(info->model, (unsigned char*) &vendor); - - return CKR_OK; - } -diff --git a/src/lib/utils.h b/src/lib/utils.h -index 81c61fae..cf357464 100644 ---- a/src/lib/utils.h -+++ b/src/lib/utils.h -@@ -39,9 +39,11 @@ - - int str_to_ul(const char *val, size_t *res); - --static inline void str_padded_copy(CK_UTF8CHAR_PTR dst, const CK_UTF8CHAR_PTR src, size_t dst_len) { -+#define str_padded_copy(dst, src) _str_padded_copy(dst, sizeof(dst), src, strnlen((const char *)src, sizeof(src))) -+static inline void _str_padded_copy(CK_UTF8CHAR_PTR dst, size_t dst_len, const CK_UTF8CHAR *src, size_t src_len) { - memset(dst, ' ', dst_len); -- memcpy(dst, src, strnlen((char *)(src), dst_len)); -+ memcpy(dst, src, src_len); -+ LOGE("BILL(%zu): %.*s\n", dst_len, dst_len, dst); - } - - twist utils_hash_pass(const twist pin, const twist salt); - -From afeae8a3846e06152fafb180077fbad4381a124d Mon Sep 17 00:00:00 2001 -From: William Roberts <[email protected]> -Date: Wed, 5 May 2021 14:09:27 -0500 -Subject: [PATCH 3/4] general: drop unused macros - -Signed-off-by: William Roberts <[email protected]> ---- - src/lib/general.h | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/src/lib/general.h b/src/lib/general.h -index 356c142d..b3089554 100644 ---- a/src/lib/general.h -+++ b/src/lib/general.h -@@ -7,17 +7,7 @@ - - #include "pkcs11.h" - --#define TPM2_TOKEN_LABEL "TPM2 PKCS#11 Token" --#define TPM2_TOKEN_MANUFACTURER "Intel" --#define TPM2_TOKEN_MODEL "TPM2 PKCS#11" - static const CK_UTF8CHAR TPM2_TOKEN_SERIAL_NUMBER[] = "0000000000000000"; --#define TPM2_TOKEN_HW_VERSION { 0, 0 } --#define TPM2_TOKEN_FW_VERSION { 0, 0 } -- --#define TPM2_SLOT_DESCRIPTION "Intel TPM2.0 Cryptoki" --#define TPM2_SLOT_MANUFACTURER TPM2_TOKEN_MANUFACTURER --#define TPM2_SLOT_HW_VERSION TPM2_TOKEN_HW_VERSION --#define TPM2_SLOT_FW_VERSION TPM2_TOKEN_FW_VERSION - - CK_RV general_init(void *init_args); - CK_RV general_get_func_list(CK_FUNCTION_LIST **function_list); - -From 8b43a99c5ff604d890bdc23fd2fa5f98aa087d83 Mon Sep 17 00:00:00 2001 -From: William Roberts <[email protected]> -Date: Wed, 5 May 2021 14:11:04 -0500 -Subject: [PATCH 4/4] token: move TPM2_TOKEN_SERIAL_NUMBER local to use - -Signed-off-by: William Roberts <[email protected]> ---- - src/lib/general.h | 2 -- - src/lib/token.c | 2 ++ - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/general.h b/src/lib/general.h -index b3089554..9afd61ec 100644 ---- a/src/lib/general.h -+++ b/src/lib/general.h -@@ -7,8 +7,6 @@ - - #include "pkcs11.h" - --static const CK_UTF8CHAR TPM2_TOKEN_SERIAL_NUMBER[] = "0000000000000000"; -- - CK_RV general_init(void *init_args); - CK_RV general_get_func_list(CK_FUNCTION_LIST **function_list); - CK_RV general_get_info(CK_INFO *info); -diff --git a/src/lib/token.c b/src/lib/token.c -index c7211296..63a9a71b 100644 ---- a/src/lib/token.c -+++ b/src/lib/token.c -@@ -20,6 +20,8 @@ - #include "token.h" - #include "utils.h" - -+static const CK_UTF8CHAR TPM2_TOKEN_SERIAL_NUMBER[] = "0000000000000000"; -+ - void pobject_config_free(pobject_config *c) { - - if (c->is_transient) { diff --git a/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.6.0.bb b/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.7.0.bb similarity index 95% rename from meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.6.0.bb rename to meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.7.0.bb index fdeda26..649338a 100644 --- a/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.6.0.bb +++ b/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.7.0.bb @@ -9,10 +9,9 @@ DEPENDS = "autoconf-archive pkgconfig dstat sqlite3 openssl libtss2-dev tpm2-too SRC_URI = "git://github.com/tpm2-software/tpm2-pkcs11.git;branch=master \ file://bootstrap_fixup.patch \ file://0001-remove-local-binary-checkes.patch \ - file://677.patch \ " -SRCREV = "c2d53cc1af6b9df13c832715442853b21048c273" +SRCREV = "862bdb845910342cd7b6e6da7495f6ee7d090a37" S = "${WORKDIR}/git" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#55191): https://lists.yoctoproject.org/g/yocto/message/55191 Mute This Topic: https://lists.yoctoproject.org/mt/86696721/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
