From 29257695c118b98750400a3065c687d742103023 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Wed, 7 Apr 2021 10:53:09 -0400
Subject: [PATCH] Updated the code with some additional messaging information
 for the provisioner when it fails.  I added a bit of code that eliminates the
 portal having an error when a support rim is failing, this doesn't allow it
 to ingest the rim into the database.

---
 .../AbstractAttestationCertificateAuthority.java           | 7 ++++++-
 HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp              | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java
index 4bc30f07..4c276cd1 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AbstractAttestationCertificateAuthority.java
@@ -790,7 +790,6 @@ public abstract class AbstractAttestationCertificateAuthority
          * 3. Update the support rim with swid tag information
          */
 
-
         if (dv.getLogfileCount() > 0) {
             for (ByteString logFile : dv.getLogfileList()) {
                 try {
@@ -805,6 +804,9 @@ public abstract class AbstractAttestationCertificateAuthority
                                 String.format("%s.rimel",
                                         defaultClientName),
                                 logFile.toByteArray());
+                        // this is a validity check
+                        new TCGEventLog(support.getRimBytes());
+                        // no issues, continue
                         support.setPlatformManufacturer(dv.getHw().getManufacturer());
                         support.setPlatformModel(dv.getHw().getProductName());
                         support.setFileName(String.format("%s_[%s].rimel", defaultClientName,
@@ -821,6 +823,9 @@ public abstract class AbstractAttestationCertificateAuthority
                     }
                 } catch (IOException ioEx) {
                     LOG.error(ioEx);
+                } catch (Exception ex) {
+                    LOG.error(String.format("Failed to load support rim: ", messageDigest.digest(
+                            logFile.toByteArray()))));
                 }
             }
         } else {
diff --git a/HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp b/HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp
index b4853705..323978ed 100644
--- a/HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp
+++ b/HIRS_ProvisionerTPM2/src/TPM2_Provisioner.cpp
@@ -160,7 +160,7 @@ int provision() {
             = provisioner.sendAttestationCertificateRequest(certificateRequest);
 
     if (akCertificateByteString == "") {
-        cout << "----> Provisioning failed.";
+        cout << "----> Provisioning the quote failed.";
         cout << "Please refer to the Attestation CA for details." << endl;
         return 0;
     }