Change sw_component_version to string in 'yaml' files
Change-Id: I7e7eb1387626345fb81489fe45e4b5494dcf1e36
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>
diff --git a/iat-verifier/sample/yaml/iat.yaml b/iat-verifier/sample/yaml/iat.yaml
index c71e962..8c53d1a 100644
--- a/iat-verifier/sample/yaml/iat.yaml
+++ b/iat-verifier/sample/yaml/iat.yaml
@@ -1,3 +1,10 @@
+#-------------------------------------------------------------------------------
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+#-------------------------------------------------------------------------------
+
boot_seed: !!binary |
BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
challenge: !!binary |
@@ -16,22 +23,22 @@
signer_id: !!binary |
BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
sw_component_type: BL
- sw_component_version: 3.4.2
+ sw_component_version: "3.4.2"
- measurement_value: !!binary |
BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
signer_id: !!binary |
BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
sw_component_type: M1
- sw_component_version: 1.2
+ sw_component_version: "1.2"
- measurement_value: !!binary |
BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
signer_id: !!binary |
BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
sw_component_type: M2
- sw_component_version: 1.2.3
+ sw_component_version: "1.2.3"
- measurement_value: !!binary |
BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
signer_id: !!binary |
BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
sw_component_type: M3
- sw_component_version: 1
+ sw_component_version: "1"
diff --git a/iat-verifier/tests/data/invalid-hw-version.yaml b/iat-verifier/tests/data/invalid-hw-version.yaml
index 16078e0..fbebf02 100644
--- a/iat-verifier/tests/data/invalid-hw-version.yaml
+++ b/iat-verifier/tests/data/invalid-hw-version.yaml
@@ -16,19 +16,19 @@
sw_components:
- sw_component_type: BL
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 3.4.2
+ sw_component_version: "3.4.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
measurement_description: TF-M_SHA256MemPreXIP
- sw_component_type: M1
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2
+ sw_component_version: "1.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M2
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2.3
+ sw_component_version: "1.2.3"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M3
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1
+ sw_component_version: "1"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
diff --git a/iat-verifier/tests/data/invalid-profile-id.yaml b/iat-verifier/tests/data/invalid-profile-id.yaml
index 42fba85..8bc3227 100644
--- a/iat-verifier/tests/data/invalid-profile-id.yaml
+++ b/iat-verifier/tests/data/invalid-profile-id.yaml
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -15,19 +15,19 @@
sw_components:
- sw_component_type: BL
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 3.4.2
+ sw_component_version: "3.4.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
measurement_description: TF-M_SHA256MemPreXIP
- sw_component_type: M1
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2
+ sw_component_version: "1.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M2
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2.3
+ sw_component_version: "1.2.3"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M3
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1
+ sw_component_version: "1"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
diff --git a/iat-verifier/tests/data/invalid-type-length.yaml b/iat-verifier/tests/data/invalid-type-length.yaml
index 5375755..4a88f07 100644
--- a/iat-verifier/tests/data/invalid-type-length.yaml
+++ b/iat-verifier/tests/data/invalid-type-length.yaml
@@ -15,19 +15,19 @@
sw_components:
- sw_component_type: BL
signer_id: Invalid_data
- sw_component_version: 3.4.2
+ sw_component_version: "3.4.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
measurement_description: TF-M_SHA256MemPreXIP
- sw_component_type: M1
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRgX
- sw_component_version: 1.2
+ sw_component_version: "1.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M2
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2.3
+ sw_component_version: "1.2.3"
measurement_value: !!binary BwYFBAMCAQ8OCgwLCgkIFxYVFBMSERAfHh0cGw==
- sw_component_type: M3
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1
+ sw_component_version: "1"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
diff --git a/iat-verifier/tests/data/missing-claim.yaml b/iat-verifier/tests/data/missing-claim.yaml
index b148c0b..a47f8cf 100644
--- a/iat-verifier/tests/data/missing-claim.yaml
+++ b/iat-verifier/tests/data/missing-claim.yaml
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -15,19 +15,19 @@
sw_components:
- sw_component_type: BL
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 3.4.2
+ sw_component_version: "3.4.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
measurement_description: TF-M_SHA256MemPreXIP
- sw_component_type: M1
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2
+ sw_component_version: "1.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M2
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2.3
+ sw_component_version: "1.2.3"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M3
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1
+ sw_component_version: "1"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
diff --git a/iat-verifier/tests/data/missing-signer-id.yaml b/iat-verifier/tests/data/missing-signer-id.yaml
index 75d3c12..72454fc 100644
--- a/iat-verifier/tests/data/missing-signer-id.yaml
+++ b/iat-verifier/tests/data/missing-signer-id.yaml
@@ -15,19 +15,19 @@
sw_components:
- sw_component_type: BL
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 3.4.2
+ sw_component_version: "3.4.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
measurement_description: TF-M_SHA256MemPreXIP
- sw_component_type: M1
#signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2
+ sw_component_version: "1.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M2
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2.3
+ sw_component_version: "1.2.3"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M3
#signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1
+ sw_component_version: "1"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
diff --git a/iat-verifier/tests/data/missing-sw-comps.yaml b/iat-verifier/tests/data/missing-sw-comps.yaml
index 1863403..9ef1c81 100644
--- a/iat-verifier/tests/data/missing-sw-comps.yaml
+++ b/iat-verifier/tests/data/missing-sw-comps.yaml
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -15,19 +15,19 @@
#sw_components:
#- sw_component_type: BL
#signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- #sw_component_version: 3.4.2
+ #sw_component_version: "3.4.2"
#measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
#measurement_description: TF-M_SHA256MemPreXIP
#- sw_component_type: M1
#signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- #sw_component_version: 1.2
+ #sw_component_version: "1.2"
#measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
#- sw_component_type: M2
#signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- #sw_component_version: 1.2.3
+ #sw_component_version: "1.2.3"
#measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
#- sw_component_type: M3
#signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- #sw_component_version: 1
+ #sw_component_version: "1"
#measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
diff --git a/iat-verifier/tests/data/submod-missing-claim.yaml b/iat-verifier/tests/data/submod-missing-claim.yaml
index 9fba392..a69fb8b 100644
--- a/iat-verifier/tests/data/submod-missing-claim.yaml
+++ b/iat-verifier/tests/data/submod-missing-claim.yaml
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -15,19 +15,19 @@
sw_components:
- sw_component_type: BL
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 3.4.2
+ sw_component_version: "3.4.2"
#measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
measurement_description: TF-M_SHA256MemPreXIP
- sw_component_type: M1
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2
+ sw_component_version: "1.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M2
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2.3
+ sw_component_version: "1.2.3"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M3
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1
+ sw_component_version: "1"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
diff --git a/iat-verifier/tests/data/unexpected-claim.yaml b/iat-verifier/tests/data/unexpected-claim.yaml
index 6c5c586..df99f48 100644
--- a/iat-verifier/tests/data/unexpected-claim.yaml
+++ b/iat-verifier/tests/data/unexpected-claim.yaml
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -15,20 +15,20 @@
sw_components:
- sw_component_type: BL
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 3.4.2
+ sw_component_version: "3.4.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
measurement_description: TF-M_SHA256MemPreXIP
3: 1
- sw_component_type: M1
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2
+ sw_component_version: "1.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M2
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2.3
+ sw_component_version: "1.2.3"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M3
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1
+ sw_component_version: "1"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
diff --git a/iat-verifier/tests/data/valid-iat.yaml b/iat-verifier/tests/data/valid-iat.yaml
index fbf2792..398b9e1 100644
--- a/iat-verifier/tests/data/valid-iat.yaml
+++ b/iat-verifier/tests/data/valid-iat.yaml
@@ -16,19 +16,19 @@
sw_components:
- sw_component_type: BL
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 3.4.2
+ sw_component_version: "3.4.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
measurement_description: TF-M_SHA256MemPreXIP
- sw_component_type: M1
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2
+ sw_component_version: "1.2"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M2
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1.2.3
+ sw_component_version: "1.2.3"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_type: M3
signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: 1
+ sw_component_version: "1"
measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=