From 39a95218e450c7454acdc6760f68eb76276f4504 Mon Sep 17 00:00:00 2001
From: lareine <lareine@evoforge.org>
Date: Thu, 3 Feb 2022 16:03:15 -0500
Subject: [PATCH] added varOsInstall system test

added badVarInstall system test
---
 .ci/system-tests/aca_policy_tests.sh          |   2 +-
 .ci/system-tests/container/rim_setup.sh       |   6 +--
 .ci/system-tests/platform_cert_tests.sh       |   2 +-
 .../rims/laptop_varOsInstall_oem.1.rimel      | Bin 0 -> 17569 bytes
 .../rims/laptop_varOsInstall_var.1.rimel      | Bin 0 -> 2613 bytes
 .../laptop_varOsInstall_oem.1.swidtag         |  42 ++++++++++++++++++
 .../laptop_varOsInstall_var.1.swidtag         |  42 ++++++++++++++++++
 .ci/system-tests/rim_system_tests.sh          |  19 ++++++++
 .ci/system-tests/run_system_tests.sh          |   1 +
 9 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 .ci/system-tests/profiles/laptop/varOsInstall/rims/laptop_varOsInstall_oem.1.rimel
 create mode 100755 .ci/system-tests/profiles/laptop/varOsInstall/rims/laptop_varOsInstall_var.1.rimel
 create mode 100644 .ci/system-tests/profiles/laptop/varOsInstall/swidtags/laptop_varOsInstall_oem.1.swidtag
 create mode 100644 .ci/system-tests/profiles/laptop/varOsInstall/swidtags/laptop_varOsInstall_var.1.swidtag
 create mode 100644 .ci/system-tests/rim_system_tests.sh

diff --git a/.ci/system-tests/aca_policy_tests.sh b/.ci/system-tests/aca_policy_tests.sh
index 5ba36599..bf23611f 100644
--- a/.ci/system-tests/aca_policy_tests.sh
+++ b/.ci/system-tests/aca_policy_tests.sh
@@ -8,7 +8,7 @@ totalTests=0;
 failedTests=0;
 
 # Start ACA Policy Tests
-# provision_tpm takes 1 parameter (the expected result): "pass" or "fail"
+# provisionTpm2 takes 1 parameter (the expected result): "pass" or "fail"
 
 writeToLogs "### ACA POLICY TEST 1: Test ACA default policy  ###"
 setPlatformCerts "laptop" "empty"
diff --git a/.ci/system-tests/container/rim_setup.sh b/.ci/system-tests/container/rim_setup.sh
index 49947efb..7d958b1e 100644
--- a/.ci/system-tests/container/rim_setup.sh
+++ b/.ci/system-tests/container/rim_setup.sh
@@ -59,8 +59,8 @@ pushd $rimDir > /dev/null
   fi
 popd > /dev/null
 
-  echo "Contents of tcg swidtag folder $tcgDir/manifest/swidtag/ : $(ls $tcgDir/manifest/swidtag/)"
-  echo "Contents of tcg rim folder tcgDir/manifest/rim/: $(ls $tcgDir/manifest/rim/)"
+#  echo "Contents of tcg swidtag folder $tcgDir/manifest/swidtag/ : $(ls $tcgDir/manifest/swidtag/)"
+#  echo "Contents of tcg rim folder tcgDir/manifest/rim/: $(ls $tcgDir/manifest/rim/)"
 
 #Step 4, run the setpcr script to make the TPM emulator hold values that correspond the binary_bios_measurement file
 #     a: Check if a test specific setpcr.sh file exists. If not use the profiles default script
@@ -68,6 +68,6 @@ if [[ ! -f $pcrScript ]]; then
     pcrScript="$testDir/"$profile"_default_setpcrs.sh"
 fi
 sh $pcrScript;
-tpm2_pcrlist -g sha256 
+#tpm2_pcrlist -g sha256 
 
 # Done with rim_setup
\ No newline at end of file
diff --git a/.ci/system-tests/platform_cert_tests.sh b/.ci/system-tests/platform_cert_tests.sh
index 13182325..0fbe7838 100644
--- a/.ci/system-tests/platform_cert_tests.sh
+++ b/.ci/system-tests/platform_cert_tests.sh
@@ -8,7 +8,7 @@ totalTests=0;
 failedTests=0;
 
 # Start ACA Platform Certificate Tests
-# provision_tpm takes 1 parameter (the expected result): "pass" or "fail"
+# provisionTpm2 takes 1 parameter (the expected result): "pass" or "fail"
 # Note that the aca_policy_tests have already run several Platform Certificate system tests
 
 writeToLogs "### ACA PLATFORM CERTIFICATE TEST 1: Test a delta Platform Certificate that adds a new memory component ###"
diff --git a/.ci/system-tests/profiles/laptop/varOsInstall/rims/laptop_varOsInstall_oem.1.rimel b/.ci/system-tests/profiles/laptop/varOsInstall/rims/laptop_varOsInstall_oem.1.rimel
new file mode 100644
index 0000000000000000000000000000000000000000..1fb646c6ee147d14fc0cb64f25118089760d8958
GIT binary patch
literal 17569
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

literal 0
HcmV?d00001

diff --git a/.ci/system-tests/profiles/laptop/varOsInstall/rims/laptop_varOsInstall_var.1.rimel b/.ci/system-tests/profiles/laptop/varOsInstall/rims/laptop_varOsInstall_var.1.rimel
new file mode 100755
index 0000000000000000000000000000000000000000..57424504850f78b0a964c1e44cf0e36b2f947643
GIT binary patch
literal 2613
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
INMk1d0gP>(!2kdN

literal 0
HcmV?d00001

diff --git a/.ci/system-tests/profiles/laptop/varOsInstall/swidtags/laptop_varOsInstall_oem.1.swidtag b/.ci/system-tests/profiles/laptop/varOsInstall/swidtags/laptop_varOsInstall_oem.1.swidtag
new file mode 100644
index 00000000..613093d3
--- /dev/null
+++ b/.ci/system-tests/profiles/laptop/varOsInstall/swidtags/laptop_varOsInstall_oem.1.swidtag
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" corpus="false" name="Dell5580" patch="false" supplemental="false" tagId="hirs.swid.SwidTags.dell5580.oem" tagVersion="1" version="0.1" versionScheme="multipartnumeric" xml:lang="en">
+  <Entity name="OEM1" regid="www.example.com" role="softwareCreator tagCreator"/>
+  <Link href="https://Example.com/support/ProductA/firmware/installfiles" rel="installationmedia"/>
+  <Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="0.1" n8060:edition="0.1" n8060:product="Dell 5580" n8060:revision="0.1" rim:BindingSpec="PC Client RIM" rim:BindingSpecVersion="1.2" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Dell Inc." rim:platformModel="Latitude 5580"/>
+  <Payload>
+    <Directory name="/boot/tcg/rim/support">
+      <File xmlns:SHA256="http://www.w3.org/2001/04/xmlenc#sha256" SHA256:hash="a1704e9cd5727c5429d16bc2829e2890aa358c59b4f3d2e191c3eaa751520ce8" name="dell5580_varOSInstall_oem.1.rimel" size="17569"/>
+    </Directory>
+  </Payload>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+      <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+        <DigestValue>YwIGXKSKuII5sXcCa9fcwU6kr7u6HwTYHp58jfPJ5ic=</DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue>KiCrZx3Pe//AJv97y9a7/APfNB24AWhOMvd4mcxPzMdkz7XEKvi93CWHqvGXmzoLthHwy6O6pPEO
+2vl8fgt8URZdx7FGRWNZMmOep91KsVvTnm64//BU+/4yvwvDSGwnDrZOWugeDYg8G+hAnVY/KFMb
+WM+pyND8K6Qw0HkIDh3iitk/luE2TElGNZEx30VUa/5W4DxL2NYPMlquJYD4nZorqU/uEpSo2HED
+T7qF9UV5tJWnrOclJH7DkCy/b1u+mcxmjfRmRemwBUHS3bbG11prgLwTMvV5jYJnDct+O/mc7CF3
+X0DP//wO4qziqK04kXLPZewB1wD2zknM35hORw==</SignatureValue>
+    <KeyInfo>
+      <KeyName>2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName>
+      <KeyValue>
+        <RSAKeyValue>
+          <Modulus>p3WVYaRJG7EABjbAdqDYZXFSTV1nHY9Ol9A5+W8t5xwBXBryZCGWxERGr5AryKWPxd+qzjj+cFpx
+xkM6N18jEhQIx/CEZePEJqpluBO5w2wTEOe7hqtMatqgDDMeDRxUuIpP8LGP00vh1wyDFFew90d9
+dvT3bcLvFh3a3ap9bTm6aBqPup5CXpzrwIU2wZfgkDytYVBm+8bHkMaUrgpNyM+5BAg2zl/Fqw0q
+otjaGr7PzbH+urCvaGbKLMPoWkVLIgAE8Qw98HTfoYSFHC7VYQySrzIinaOBFSgViR72kHemH2lW
+jDQeHiY0VIoPik/jVVIpjWe6zzeZ2S66Q/LmjQ==</Modulus>
+          <Exponent>AQAB</Exponent>
+        </RSAKeyValue>
+      </KeyValue>
+    </KeyInfo>
+  </Signature>
+</SoftwareIdentity>
diff --git a/.ci/system-tests/profiles/laptop/varOsInstall/swidtags/laptop_varOsInstall_var.1.swidtag b/.ci/system-tests/profiles/laptop/varOsInstall/swidtags/laptop_varOsInstall_var.1.swidtag
new file mode 100644
index 00000000..fa6c48bd
--- /dev/null
+++ b/.ci/system-tests/profiles/laptop/varOsInstall/swidtags/laptop_varOsInstall_var.1.swidtag
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" corpus="false" name="Dell5580" patch="false" supplemental="true" tagId="hirs.swid.SwidTags.dell5580.var" tagVersion="1" version="0.1" xml:lang="en">
+  <Entity name="VAR1" regid="www.example.com" role="softwareCreator tagCreator"/>
+  <Link href="hirs.swid.SwidTags.dell5580.oem" rel="requires"/>
+  <Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="0.1" n8060:edition="0.1" n8060:product="Dell 5580" n8060:revision="0.1" rim:BindingSpec="PC Client RIM" rim:BindingSpecVersion="1.2" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Dell Inc." rim:platformModel="Latitude 5580" rim:rimLinkHash="4Jocgla7QhDNd0Fs+nDfBUTLQsltTgd6Yob5ChlDg74="/>
+  <Payload>
+    <Directory name="/boot/tcg/rim/support">
+      <File xmlns:SHA256="http://www.w3.org/2001/04/xmlenc#sha256" SHA256:hash="aad27380fa51f42130057cdc524f16da3e5cd959a59fc2b3574470069b95a15e" name="dell5580_varOSInstall_var.1.rimel" size="2613"/>
+    </Directory>
+  </Payload>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+      <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+        <DigestValue>F5FruNNKqjgKSP6BOF7YUaBs9dSN8+HnYdpuYoBSWF8=</DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue>mXABBSi1haZdZZKg3OzdaLi0jZFp0A78YmFqMtaTdSTNBI/xwrzy1rIIdEc7JWqy5emAcfr2abgc
+4AgOIkmcJgYD8AECcmWVloANi7uT03l4e4FMVmDL8l/Cu/93yt/+5MJeWcu3HQvwbIPkYqOqXTNu
+kWVvLr8KG0v42t+TRn38O1+EDGwHlDL/705SYZwvNP12Z7+b7FKizUisn5WZC77mzJ1/9m49aiqn
+mqf56NxmHuA3uhFShfjaIwoljWVLDCt3/fkrM9WSsk3tX7c8g+QhKn4ygqiMn7gI48HH0PGbbA5q
+mg5c9Farqs0mbGR4WTvXjXioSFV5NYkcdoFfmQ==</SignatureValue>
+    <KeyInfo>
+      <KeyName>2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName>
+      <KeyValue>
+        <RSAKeyValue>
+          <Modulus>p3WVYaRJG7EABjbAdqDYZXFSTV1nHY9Ol9A5+W8t5xwBXBryZCGWxERGr5AryKWPxd+qzjj+cFpx
+xkM6N18jEhQIx/CEZePEJqpluBO5w2wTEOe7hqtMatqgDDMeDRxUuIpP8LGP00vh1wyDFFew90d9
+dvT3bcLvFh3a3ap9bTm6aBqPup5CXpzrwIU2wZfgkDytYVBm+8bHkMaUrgpNyM+5BAg2zl/Fqw0q
+otjaGr7PzbH+urCvaGbKLMPoWkVLIgAE8Qw98HTfoYSFHC7VYQySrzIinaOBFSgViR72kHemH2lW
+jDQeHiY0VIoPik/jVVIpjWe6zzeZ2S66Q/LmjQ==</Modulus>
+          <Exponent>AQAB</Exponent>
+        </RSAKeyValue>
+      </KeyValue>
+    </KeyInfo>
+  </Signature>
+</SoftwareIdentity>
diff --git a/.ci/system-tests/rim_system_tests.sh b/.ci/system-tests/rim_system_tests.sh
new file mode 100644
index 00000000..147efbf6
--- /dev/null
+++ b/.ci/system-tests/rim_system_tests.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+#########################################################################################
+#    HIRS Reference Integrity Manifest System Tests
+#
+#########################################################################################
+testResult=false
+totalTests=0;
+failedTests=0;
+
+# Start ACA Reference Integrity Manifest Tests
+# provisionTpm2 takes 1 parameter (the expected result): "pass" or "fail"
+# Note that the aca_policy_tests have already run several RIM system tests
+
+writeToLogs "### ACA RIM TEST 1: Test a RIM from an OEM and a Supplemental RIM from a VAR ###"
+clearAcaDb
+uploadTrustedCerts
+setPolicyEkPcFw
+setPlatformCerts "laptop" "varOsInstall"
+provisionTpm2 "pass"
\ No newline at end of file
diff --git a/.ci/system-tests/run_system_tests.sh b/.ci/system-tests/run_system_tests.sh
index 2ea24ea8..572011e9 100644
--- a/.ci/system-tests/run_system_tests.sh
+++ b/.ci/system-tests/run_system_tests.sh
@@ -38,6 +38,7 @@ echo "******** Setup Complete Begin HIRS System Tests ******** "
 
 source aca_policy_tests.sh
 source platform_cert_tests.sh
+source rim_system_tests.sh
 
 
 echo "******** HIRS System Tests Complete ******** "