Skip to contentSkip to conversation

package/ima-evm-utils: bump version to 1.3

PATCH Superseded Petr Vorel 2 participants 6 messages Jul 22, 2020 – Jul 23, 2020

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/3 package/ima-evm-utils: bump version to 1.3

added tpm2-tss as dependency (needed for ima_boot_aggregate cmd for reading PCR; better to use libtss2-esys and libtss2-rc than require tsspcrread binary in runtime)

added also sha1 hash from sourceforge

---
 package/ima-evm-utils/Config.in          | 3 ++-
 package/ima-evm-utils/ima-evm-utils.hash | 5 +++--
 package/ima-evm-utils/ima-evm-utils.mk   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)
package/ima-evm-utils/Config.in +2 -1
index 851e2456bc..6c29c9de28 100644
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_IMA_EVM_UTILS
 	bool "ima-evm-utils"
 	depends on BR2_USE_MMU # keyutils
-	depends on !BR2_STATIC_LIBS # keyutils
+	depends on !BR2_STATIC_LIBS # keyutils, tpm2-tss
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_KEYUTILS
+	select BR2_PACKAGE_TPM2_TSS
 	help
 	  Linux Integrity Measurement Architecture (IMA)
 	  Extended Verification Module (EVM) tools.
package/ima-evm-utils/ima-evm-utils.hash +3 -2
index 24be627d20..4fe1591f74 100644
@@ -1,3 +1,4 @@
-# Locally computed
-sha256 ad8471b58c4df29abd51c80d74b1501cfe3289b60d32d1b318618a8fd26c0c0a  ima-evm-utils-1.2.1.tar.gz
+# sha1 from sourceforge, sha256 locally computed
+sha1  8b81f83ddc0e7c863268e76049fa50ad89a04b11  ima-evm-utils-1.3.tar.gz
+sha256 62e90e8dc6b131a4f34a356114cdcb5bef844f110abbdd5d8b53c449aecc609f  ima-evm-utils-1.3.tar.gz
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
package/ima-evm-utils/ima-evm-utils.mk +2 -2
index b944eda13c..70295643a4 100644
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-IMA_EVM_UTILS_VERSION = 1.2.1
+IMA_EVM_UTILS_VERSION = 1.3
 IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils
 IMA_EVM_UTILS_LICENSE = GPL-2.0
 IMA_EVM_UTILS_LICENSE_FILES = COPYING
-IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl
+IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss
 
 # Tarball doesn't contain configure
 IMA_EVM_UTILS_AUTORECONF = YES
Signature · 1 line
2.27.0
author
#1 lore raw

PATCH 2/3 package/ima-evm-utils: fix build for old compilers

Fixes:

                     sourcery-arm-armv4t [38/44]: FAILED
                            sourcery-arm [39/44]: FAILED
                     sourcery-arm-thumb2 [40/44]: FAILED

---
Acked by upstream, but not yet merged.
https://lore.kernel.org/linux-integrity/1595416105.5311.33.camel at linux.ibm.com/T/#mc663d7aa4e39752db4034de49a9fda2442185009

Kind regards,
Petr

 ...ss-Fix-compilation-for-old-compilers.patch | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 package/ima-evm-utils/0001-pcr_tss-Fix-compilation-for-old-compilers.patch
package/ima-evm-utils/0001-pcr_tss-Fix-compilation-for-old-compilers.patch new file +51 -0
new file mode 100644
index 0000000000..258a74fe8c
@@ -0,0 +1,51 @@
+From 8e98b5bbf2127131f968a5d864f86e8443505639 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <[email protected]>
+Date: Wed, 22 Jul 2020 12:06:28 +0200
+Subject: [PATCH] pcr_tss: Fix compilation for old compilers
+
+pcr_tss.c: In function 'pcr_selections_match':
+pcr_tss.c:73:2: error: 'for' loop initial declarations are only allowed in C99 mode
+  for (int i = 0; i < a->count; i++) {
+  ^
+pcr_tss.c:73:2: note: use option -std=c99 or -std=gnu99 to compile your code
+pcr_tss.c:78:3: error: 'for' loop initial declarations are only allowed in C99 mode
+   for (int j = 0; j < a->pcrSelections[i].sizeofSelect; j++) {
+   ^
+
+Fixes: 03f99ea ("ima-evm-utils: Add support for Intel TSS2 for PCR
+reading")
+
+Signed-off-by: Petr Vorel <[email protected]>
+Signed-off-by: Petr Vorel <[email protected]>
+[ upstream status: https://lore.kernel.org/linux-integrity/1595416105.5311.33.camel at linux.ibm.com/T/#t ]
+---
+ src/pcr_tss.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/pcr_tss.c b/src/pcr_tss.c
+index 11b247b..feb1ff7 100644
+--- a/src/pcr_tss.c
++++ b/src/pcr_tss.c
+@@ -68,14 +68,17 @@ int tpm2_pcr_supported(void)
+ 
+ static int pcr_selections_match(TPML_PCR_SELECTION *a, TPML_PCR_SELECTION *b)
+ {
++	int i, j;
++
+ 	if (a->count != b->count)
+ 		return 0;
+-	for (int i = 0; i < a->count; i++) {
++
++	for (i = 0; i < a->count; i++) {
+ 		if (a->pcrSelections[i].hash != b->pcrSelections[i].hash)
+ 			return 0;
+ 		if (a->pcrSelections[i].sizeofSelect != b->pcrSelections[i].sizeofSelect)
+ 			return 0;
+-		for (int j = 0; j < a->pcrSelections[i].sizeofSelect; j++) {
++		for (j = 0; j < a->pcrSelections[i].sizeofSelect; j++) {
+ 			if (a->pcrSelections[i].pcrSelect[j] != b->pcrSelections[i].pcrSelect[j])
+ 				return 0;
+ 		}
+-- 
+2.27.0
+
Signature · 1 line
2.27.0
#2 lore raw

PATCH 2/3 package/ima-evm-utils: fix build for old compilers

Quoted 6 lines · On Wed, 22 Jul 2020 21:35:31 +0200 Petr Vorel <[email protected]> wrote:

Fixes:

                     sourcery-arm-armv4t [38/44]: FAILED
                            sourcery-arm [39/44]: FAILED
                     sourcery-arm-thumb2 [40/44]: FAILED

Is this needed only due to the 1.3 version bump ? Were these old compilers building ima-evm-utils properly in the current version we have in Buildroot ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#3 lore raw

PATCH 3/3 package/ima-evm-utils: fix build on musl

In reply to Petr Vorel

Fixes:

                   br-arm-cortex-a9-musl [ 7/44]: FAILED
                br-i386-pentium-mmx-musl [12/44]: FAILED
                          br-x86-64-musl [34/44]: FAILED
                          linaro-aarch64 [36/44]: FAILED
---
 ...Fix-missing-u-g-id_t-typedef-on-musl.patch | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/ima-evm-utils/0002-Fix-missing-u-g-id_t-typedef-on-musl.patch
package/ima-evm-utils/0002-Fix-missing-u-g-id_t-typedef-on-musl.patch new file +29 -0
new file mode 100644
index 0000000000..280f0fa940
@@ -0,0 +1,29 @@
+From 2876dbf991f7fee827ef7e27d3b955063475fd98 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <[email protected]>
+Date: Wed, 22 Jul 2020 13:10:20 +0200
+Subject: [PATCH] Fix missing {u,g}id_t typedef on musl
+
+Fixes: 273701a ("evmctl - IMA/EVM control tool")
+
+Signed-off-by: Petr Vorel <[email protected]>
+[ upstream status: https://lore.kernel.org/linux-integrity/20200722193246.13140-1-petr.vorel at gmail.com/T/#u ]
+---
+ src/imaevm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/imaevm.h b/src/imaevm.h
+index 30e9730..3f1db97 100644
+--- a/src/imaevm.h
++++ b/src/imaevm.h
+@@ -46,7 +46,7 @@
+ #include <syslog.h>
+ #include <stdbool.h>
+ #include <errno.h>
+-
++#include <sys/types.h>
+ #include <openssl/rsa.h>
+ 
+ #ifdef USE_FPRINTF
+-- 
+2.27.0
+
Signature · 1 line
2.27.0
#4 lore raw

PATCH 3/3 package/ima-evm-utils: fix build on musl

Quoted 7 lines · On Wed, 22 Jul 2020 21:35:32 +0200 Petr Vorel <[email protected]> wrote:

Fixes:

                   br-arm-cortex-a9-musl [ 7/44]: FAILED
                br-i386-pentium-mmx-musl [12/44]: FAILED
                          br-x86-64-musl [34/44]: FAILED
                          linaro-aarch64 [36/44]: FAILED

Same question as for PATCH 2/3: is this needed after the 1.3 version bump, or is this needed independently of the version bump.

There are two possibilities:

- The fixes of PATCH 2/3 and PATCH 3/3 are needed independently of the version bump. In this case, they should be in the patch series *before* the 1.3 version bump, so that we know those fixes can for example be backported to our LTS/stable branch.

- The fixes of PATCH 2/3 and PATCH 3/3 are needed due to issues/regressions introduced by the 1.3 version bump. In this case, they should be part of the version bump patch itself, to not break bisectability.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#5 lore raw

PATCH 3/3 package/ima-evm-utils: fix build on musl

Hi Thomas,

Quoted 21 lines
Quoted 7 lines · On Wed, 22 Jul 2020 21:35:32 +0200 Petr Vorel <[email protected]> wrote:

Fixes:

                   br-arm-cortex-a9-musl [ 7/44]: FAILED
                br-i386-pentium-mmx-musl [12/44]: FAILED
                          br-x86-64-musl [34/44]: FAILED
                          linaro-aarch64 [36/44]: FAILED

Same question as for PATCH 2/3: is this needed after the 1.3 version bump, or is this needed independently of the version bump.

There are two possibilities:

- The fixes of PATCH 2/3 and PATCH 3/3 are needed independently of the version bump. In this case, they should be in the patch series *before* the 1.3 version bump, so that we know those fixes can for example be backported to our LTS/stable branch.

Quoted 4 lines

- The fixes of PATCH 2/3 and PATCH 3/3 are needed due to issues/regressions introduced by the 1.3 version bump. In this case, they should be part of the version bump patch itself, to not break bisectability.

Sorry for not taking care for older release.
Musl fix is there from the beginning. I'm sending v2, where I reflect that.

Quoted 3 lines

Thanks!

Thomas

Kind regards,
Petr