Remove sample dir
Change-Id: I6a5df49aa57bf579d4b64f7726d02205c98e1600
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>
diff --git a/iat-verifier/README.rst b/iat-verifier/README.rst
index e3e8d0e..b9e220e 100644
--- a/iat-verifier/README.rst
+++ b/iat-verifier/README.rst
@@ -49,7 +49,7 @@
* the token type
-You can find an example in the ``sample`` directory.
+You can find an example in the ``tests/data`` directory.
The script will extract the COSE payload and make sure that it is a
valid IAT (i.e. all mandatory fields are present, and all known
@@ -57,16 +57,16 @@
.. code:: bash
- $ check_iat -t PSA-IoT-Profile1-token sample/cbor/iat.cbor
+ $ check_iat -t PSA-IoT-Profile1-token tests/data/iat.cbor
Token format OK
If you want the script to verify the signature, you need to specify the
file containing the signing key in PEM format using -k option. The key
-used to sign sample/iat.cbor is inside sample/key.pem.
+used to sign tests/data/iat.cbor is inside tests/data/key.pem.
::
- $ check_iat -t PSA-IoT-Profile1-token -k sample/key.pem sample/cbor/iat.cbor
+ $ check_iat -t PSA-IoT-Profile1-token -k tests/data/key.pem tests/data/iat.cbor
Signature OK
Token format OK
@@ -121,7 +121,7 @@
.. code:: bash
- $ compile_token -t PSA-IoT-Profile1-token -k sample/key.pem sample/yaml/iat.yaml > sample_token.cbor
+ $ compile_token -t PSA-IoT-Profile1-token -k tests/data/key.pem tests/data/iat.yaml > sample_token.cbor
*No validation* is performed as part of this, so there is no guarantee that a
valid IAT will be produced.
@@ -141,7 +141,7 @@
.. code:: bash
- $ decompile_token -t PSA-IoT-Profile1-token sample/cbor/iat.cbor
+ $ decompile_token -t PSA-IoT-Profile1-token tests/data/iat.cbor
boot_seed: !!binary |
BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
challenge: !!binary |
@@ -194,7 +194,7 @@
::
- $ check_iat -t PSA-IoT-Profile1-token -m mac -k sample/hmac.key sample/iat-hmac.cbor
+ $ check_iat -t PSA-IoT-Profile1-token -m mac -k tests/data/hmac.key tests/data/iat-hmac.cbor
Signature OK
Token format OK
diff --git a/iat-verifier/sample/cbor/badsig.cbor b/iat-verifier/sample/cbor/badsig.cbor
deleted file mode 100644
index a38dead..0000000
--- a/iat-verifier/sample/cbor/badsig.cbor
+++ /dev/null
Binary files differ
diff --git a/iat-verifier/sample/cbor/malformed.cbor b/iat-verifier/sample/cbor/malformed.cbor
deleted file mode 100644
index ac144ed..0000000
--- a/iat-verifier/sample/cbor/malformed.cbor
+++ /dev/null
Binary files differ
diff --git a/iat-verifier/sample/cca_platform.pem b/iat-verifier/sample/cca_platform.pem
deleted file mode 100644
index 3645669..0000000
--- a/iat-verifier/sample/cca_platform.pem
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDCKwJDJlYafYawTWPArAhomq26zhiA6xzXXzphVU4uR90xEsNWAJD77
-eZopPcuqCJmgBwYFK4EEACKhZANiAAQhKGfFLiuVCLCkIKkFYPOU0t+qIb3XUU/x
-qQGv5+H3i7EdTmb4qKOK+navajHE3oyEzi2vyZZCWLU/rXGHdPRWINERsXboMY4R
-h9sCNaMY03ull/7oDg5MdioSvLPqbtQ=
------END EC PRIVATE KEY-----
diff --git a/iat-verifier/sample/cca_realm.pem b/iat-verifier/sample/cca_realm.pem
deleted file mode 100644
index 1a8d3a5..0000000
--- a/iat-verifier/sample/cca_realm.pem
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDAgEcfwPO5DJRduUk8DPAzh4hp25sGk8Lg5qh32Hg6KXIoFdA+bae+n
-6xpBhb0Rf2igBwYFK4EEACKhZANiAAR2+YgJG+WF7UGAGuz6uFhUjGMFfhaw5nYS
-C70NL5wp4FbF1BoBMOucIVF4mdwjFGso4bBivT6ksxX9IZ8cu1KMtudMpJvhZ3Nz
-T2GhymEDGyu/PZGPL5T/xCKOUJGVRK4=
------END EC PRIVATE KEY-----
\ No newline at end of file
diff --git a/iat-verifier/sample/hmac.key b/iat-verifier/sample/hmac.key
deleted file mode 100644
index e9569f1..0000000
--- a/iat-verifier/sample/hmac.key
+++ /dev/null
Binary files differ
diff --git a/iat-verifier/sample/key.pem b/iat-verifier/sample/key.pem
deleted file mode 100644
index df1e6ec..0000000
--- a/iat-verifier/sample/key.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEP//suV+AhafEDh0+p5C+9Ot4zdd9WFA6ZMFgD5GzPnoAoGCCqGSM49
-AwEHoUQDQgAETl4iCZ47zrRbRG0TVf0dw7VFlHtv18HInYhnmMNybo+A1wuECyVq
-rDSmLt4QQzZPBECV8ANHS5HgGCCSr7E/Lg==
------END EC PRIVATE KEY-----
diff --git a/iat-verifier/sample/key.pub.pem b/iat-verifier/sample/key.pub.pem
deleted file mode 100644
index 924db30..0000000
--- a/iat-verifier/sample/key.pub.pem
+++ /dev/null
@@ -1,4 +0,0 @@
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAETl4iCZ47zrRbRG0TVf0dw7VFlHtv
-18HInYhnmMNybo+A1wuECyVqrDSmLt4QQzZPBECV8ANHS5HgGCCSr7E/Lg==
------END PUBLIC KEY-----
diff --git a/iat-verifier/sample/yaml/cca_platform_token.yaml b/iat-verifier/sample/yaml/cca_platform_token.yaml
deleted file mode 100644
index cdf3819..0000000
--- a/iat-verifier/sample/yaml/cca_platform_token.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-#-------------------------------------------------------------------------------
-
-cca_attestation_profile: http://arm.com/CCA-SSD/1.0.0
-cca_platform_challenge: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
-cca_platform_implementation_id: !!binary f0VMRgIBAQAAAAAAAAAAAAMAPgABAAAAUFgAAAAAAAA=
-cca_platform_instance_id: !!binary AQcGBQQDAgEADw4NDAsKCQgXFhUUExIREB8eHRwbGhkY
-cca_platform_config: !!binary AQcGBQQDAgEADw4NDAsKCQgXFhUUExIREB8eHRwbGhkY
-cca_platform_lifecycle: secured_0x3003
-cca_platform_hash_algo_id: sha-256
-cca_platform_sw_components:
- - sw_component_type: BL
- signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: "3.4.2"
- measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- cca_sw_component_hash_id: TF-M_SHA256MemPreXIP
- - sw_component_type: M1
- signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: "1.2"
- measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- - sw_component_type: M2
- signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: "1.2.3"
- measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- - sw_component_type: M3
- signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: "1"
- measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
-cca_platform_verification_service: whatever.com
\ No newline at end of file
diff --git a/iat-verifier/sample/yaml/valid-cca-token.yaml b/iat-verifier/sample/yaml/valid-cca-token.yaml
deleted file mode 100644
index 9d1f354..0000000
--- a/iat-verifier/sample/yaml/valid-cca-token.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-#-------------------------------------------------------------------------------
-
-cca_platform_token:
- cca_attestation_profile: http://arm.com/CCA-SSD/1.0.0
- cca_platform_challenge: !!binary tZc8touqn8VVWHhrfsZ/aeQN9bpaqSHNDCf0BYegEeo=
- cca_platform_implementation_id: !!binary f0VMRgIBAQAAAAAAAAAAAAMAPgABAAAAUFgAAAAAAAA=
- cca_platform_instance_id: !!binary AQcGBQQDAgEADw4NDAsKCQgXFhUUExIREB8eHRwbGhkY
- cca_platform_config: !!binary AQcGBQQDAgEADw4NDAsKCQgXFhUUExIREB8eHRwbGhkY
- cca_platform_lifecycle: secured_0x3003
- cca_platform_hash_algo_id: sha-256
- cca_platform_sw_components:
- - sw_component_type: BL
- signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: "3.4.2"
- measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- cca_sw_component_hash_id: sha-256
- - sw_component_type: M1
- signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: "1.2"
- measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- - sw_component_type: M2
- signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: "1.2.3"
- measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- - sw_component_type: M3
- signer_id: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- sw_component_version: "1"
- measurement_value: !!binary BwYFBAMCAQAPDg0MCwoJCBcWFRQTEhEQHx4dHBsaGRg=
- cca_platform_verification_service: whatever.com
-cca_realm_delegated_token:
- cca_realm_challenge: !!binary |
- q6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6ur
- q6urq6urqw==
- cca_realm_hash_algm_id: sha-256
- cca_realm_pub_key_hash_algo_id: sha-256
- cca_realm_personalization_value: !!binary |
- VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIDEzIGxhenkgZG9ncy5UaGUgcXVpY2sgYnJvd24gZm94IA==
- cca_realm_pub_key: !!binary |
- BHb5iAkb5YXtQYAa7Pq4WFSMYwV+FrDmdhILvQ0vnCngVsXUGgEw65whUXiZ3CMUayjhsGK9PqSzFf0hnxy7Uoy250ykm+Fnc3NPYaHKYQMbK789kY8vlP/EIo5QkZVErg==
- cca_realm_initial_measurement: !!binary |
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
- cca_realm_extensible_measurements:
- - !!binary |
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
- - !!binary |
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
- - !!binary |
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
- - !!binary |
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/iat-verifier/sample/cbor/cca_platform_token.cbor b/iat-verifier/tests/data/cca_platform_token.cbor
similarity index 100%
rename from iat-verifier/sample/cbor/cca_platform_token.cbor
rename to iat-verifier/tests/data/cca_platform_token.cbor
Binary files differ
diff --git a/iat-verifier/sample/cbor/cca_token.cbor b/iat-verifier/tests/data/cca_token.cbor
similarity index 100%
rename from iat-verifier/sample/cbor/cca_token.cbor
rename to iat-verifier/tests/data/cca_token.cbor
Binary files differ
diff --git a/iat-verifier/sample/iat-hmac.cbor b/iat-verifier/tests/data/iat-hmac.cbor
similarity index 100%
rename from iat-verifier/sample/iat-hmac.cbor
rename to iat-verifier/tests/data/iat-hmac.cbor
Binary files differ
diff --git a/iat-verifier/sample/cbor/iat.cbor b/iat-verifier/tests/data/iat.cbor
similarity index 100%
rename from iat-verifier/sample/cbor/iat.cbor
rename to iat-verifier/tests/data/iat.cbor
Binary files differ
diff --git a/iat-verifier/sample/yaml/iat.yaml b/iat-verifier/tests/data/iat.yaml
similarity index 100%
rename from iat-verifier/sample/yaml/iat.yaml
rename to iat-verifier/tests/data/iat.yaml
diff --git a/iat-verifier/sample/cbor/invalid-profile-id.cbor b/iat-verifier/tests/data/invalid-profile-id.cbor
similarity index 100%
rename from iat-verifier/sample/cbor/invalid-profile-id.cbor
rename to iat-verifier/tests/data/invalid-profile-id.cbor
Binary files differ
diff --git a/iat-verifier/tests/data/malformed.cbor b/iat-verifier/tests/data/malformed.cbor
index ff094d4..ac144ed 100644
--- a/iat-verifier/tests/data/malformed.cbor
+++ b/iat-verifier/tests/data/malformed.cbor
Binary files differ
diff --git a/iat-verifier/sample/cbor/missing-claim.cbor b/iat-verifier/tests/data/missing-claim.cbor
similarity index 100%
rename from iat-verifier/sample/cbor/missing-claim.cbor
rename to iat-verifier/tests/data/missing-claim.cbor
Binary files differ
diff --git a/iat-verifier/sample/cbor/missing-sw-comps.cbor b/iat-verifier/tests/data/missing-sw-comps.cbor
similarity index 100%
rename from iat-verifier/sample/cbor/missing-sw-comps.cbor
rename to iat-verifier/tests/data/missing-sw-comps.cbor
Binary files differ
diff --git a/iat-verifier/sample/cbor/no-sw-measurements.cbor b/iat-verifier/tests/data/no-sw-measurements.cbor
similarity index 100%
rename from iat-verifier/sample/cbor/no-sw-measurements.cbor
rename to iat-verifier/tests/data/no-sw-measurements.cbor
Binary files differ
diff --git a/iat-verifier/sample/cbor/psa-2_0_0_sign1-token.cbor b/iat-verifier/tests/data/psa-2_0_0_sign1-token.cbor
similarity index 100%
rename from iat-verifier/sample/cbor/psa-2_0_0_sign1-token.cbor
rename to iat-verifier/tests/data/psa-2_0_0_sign1-token.cbor
Binary files differ
diff --git a/iat-verifier/sample/yaml/psa-2_0_0_token.yaml b/iat-verifier/tests/data/psa-2_0_0_token.yaml
similarity index 100%
rename from iat-verifier/sample/yaml/psa-2_0_0_token.yaml
rename to iat-verifier/tests/data/psa-2_0_0_token.yaml
diff --git a/iat-verifier/sample/cbor/submod-missing-claim.cbor b/iat-verifier/tests/data/submod-missing-claim.cbor
similarity index 100%
rename from iat-verifier/sample/cbor/submod-missing-claim.cbor
rename to iat-verifier/tests/data/submod-missing-claim.cbor
Binary files differ