From d63e95f960713ab0b7f315ca20df63267c2d2b65 Mon Sep 17 00:00:00 2001
From: lareine <lareine@evoforge.org>
Date: Thu, 27 May 2021 13:36:19 -0400
Subject: [PATCH 1/8] added docker login to travis.yml

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 1a7ea2ed..f7c693a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ cache:
 install: true
 
 script:
+        - echo "$DOCKER_HUB_ACCESS_TOKEN" | docker login -u "$DOCKER_HUB_USERNAME" --password-stdin
         - docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:centos7 /bin/bash -c "cd /HIRS; ./gradlew :$SUBPROJECT:build -x test :$TCG_RIM_TOOL:build"
 
 jobs:

From c3ce9988f578c301750d4c98976934a24fdbb13a Mon Sep 17 00:00:00 2001
From: lareine <lareine@evoforge.org>
Date: Thu, 27 May 2021 14:41:33 -0400
Subject: [PATCH 2/8] no changes- force build

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f7c693a1..8c49427f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,7 @@ script:
         - echo "$DOCKER_HUB_ACCESS_TOKEN" | docker login -u "$DOCKER_HUB_USERNAME" --password-stdin
         - docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:centos7 /bin/bash -c "cd /HIRS; ./gradlew :$SUBPROJECT:build -x test :$TCG_RIM_TOOL:build"
 
+
 jobs:
   include:
     - stage: Packaging and System Tests

From aadea1d3198209a36b03caf2043dadecd062d3df Mon Sep 17 00:00:00 2001
From: lareine <lareine@evoforge.org>
Date: Thu, 27 May 2021 15:10:58 -0400
Subject: [PATCH 3/8] updated log to docker

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8c49427f..92728db1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ cache:
 install: true
 
 script:
-        - echo "$DOCKER_HUB_ACCESS_TOKEN" | docker login -u "$DOCKER_HUB_USERNAME" --password-stdin
+        - echo "docker login -u "$DOCKER_USER" -p "$DOCKER_PWD" 
         - docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:centos7 /bin/bash -c "cd /HIRS; ./gradlew :$SUBPROJECT:build -x test :$TCG_RIM_TOOL:build"
 
 

From 381f88eb2344e4ac4c5fb1409ec731f12b14912c Mon Sep 17 00:00:00 2001
From: lareine <lareine@evoforge.org>
Date: Thu, 27 May 2021 15:14:24 -0400
Subject: [PATCH 4/8] updated login to docker

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 92728db1..46b9e0be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ cache:
 install: true
 
 script:
-        - echo "docker login -u "$DOCKER_USER" -p "$DOCKER_PWD" 
+        - docker login -u "$DOCKER_USER" -p "$DOCKER_PWD" 
         - docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:centos7 /bin/bash -c "cd /HIRS; ./gradlew :$SUBPROJECT:build -x test :$TCG_RIM_TOOL:build"
 
 

From f05bfa776d561812b44929f3941a0987e77465dd Mon Sep 17 00:00:00 2001
From: lareine <lareine@evoforge.org>
Date: Thu, 27 May 2021 15:24:39 -0400
Subject: [PATCH 5/8] updated login to docker

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 46b9e0be..5533c952 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ cache:
 install: true
 
 script:
-        - docker login -u "$DOCKER_USER" -p "$DOCKER_PWD" 
+        - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
         - docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:centos7 /bin/bash -c "cd /HIRS; ./gradlew :$SUBPROJECT:build -x test :$TCG_RIM_TOOL:build"
 
 

From 766ff75261ac2e0932128f09efc9d729b9ed9201 Mon Sep 17 00:00:00 2001
From: lareine <lareine@evoforge.org>
Date: Thu, 27 May 2021 15:43:44 -0400
Subject: [PATCH 6/8] fixed style check issue in CommandTpm2.cpp

---
 HIRS_ProvisionerTPM2/src/CommandTpm2.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp b/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp
index 4fc2a0f3..2f31e69e 100644
--- a/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp
+++ b/HIRS_ProvisionerTPM2/src/CommandTpm2.cpp
@@ -816,10 +816,10 @@ string CommandTpm2::runTpm2CommandWithRetry(const string& command,
         try {
             if (command.compare(kTpm2ToolsNvReadCommand) == 0) {
                 return hirs::utils::Process::runData(command, args,
-                                                 "CommandTpm2.cpp", sourceCodeLineNumber);
+                            "CommandTpm2.cpp", sourceCodeLineNumber);
             } else {
                 return hirs::utils::Process::run(command, args,
-                                                 "CommandTpm2.cpp", sourceCodeLineNumber);
+                             "CommandTpm2.cpp", sourceCodeLineNumber);
             }
         } catch (HirsRuntimeException& ex) {
             tpmErrorCode = Tpm2ToolsOutputParser::parseTpmErrorCode(ex.what());

From 15ee70693fd7ae8271c73f1db649a879506b9a64 Mon Sep 17 00:00:00 2001
From: lareine <lareine@evoforge.org>
Date: Thu, 27 May 2021 16:00:07 -0400
Subject: [PATCH 7/8] added docker login to system tests

---
 .travis.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5533c952..5e95cf81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,26 +36,35 @@ script:
         - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
         - docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:centos7 /bin/bash -c "cd /HIRS; ./gradlew :$SUBPROJECT:build -x test :$TCG_RIM_TOOL:build"
 
-
 jobs:
   include:
     - stage: Packaging and System Tests
-      script: docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:ubuntu18 /bin/bash -c "cd /HIRS; ./package/package.ubuntu.sh"
+      script:
+	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:ubuntu18 /bin/bash -c "cd /HIRS; ./package/package.ubuntu.sh"
       env: null
       name: "Package Ubuntu"
     - stage: Packaging and System Tests
-      script: .ci/system-tests/./run-system-tests.sh
+      script: 
+	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - .ci/system-tests/./run-system-tests.sh
       env: null
       name: "System Tests TPM 1.2"
     - stage: Packaging and System Tests
-      script: .ci/system-tests/./run-system-tests-tpm2.sh
+      script: 
+	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - .ci/system-tests/./run-system-tests-tpm2.sh
       env: null
       name: "System Tests TPM 2.0"
     - stage: Packaging and System Tests
-      script: .ci/system-tests/./run-system-tests-tpm2-base-delta-bad.sh
+      script: 
+	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - .ci/system-tests/./run-system-tests-tpm2-base-delta-bad.sh
       env: null
       name: "System Tests TPM 2.0 Base/Delta(Bad)"
     - stage: Packaging and System Tests
-      script: .ci/system-tests/./run-system-tests-tpm2-base-delta-good.sh
+      script: 
+	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - .ci/system-tests/./run-system-tests-tpm2-base-delta-good.sh
       env: null
       name: "System Tests TPM 2.0 Base/Delta(Good)"

From 48141ed9c1649c9fbc39c5f08e7a9f7c3584a007 Mon Sep 17 00:00:00 2001
From: lareine <lareine@evoforge.org>
Date: Thu, 27 May 2021 16:12:14 -0400
Subject: [PATCH 8/8] added docker login to system tests

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5e95cf81..db1196e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,31 +40,31 @@ jobs:
   include:
     - stage: Packaging and System Tests
       script:
-	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
             - docker run --rm -v $(pwd):/HIRS hirs/hirs-ci:ubuntu18 /bin/bash -c "cd /HIRS; ./package/package.ubuntu.sh"
       env: null
       name: "Package Ubuntu"
     - stage: Packaging and System Tests
       script: 
-	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
             - .ci/system-tests/./run-system-tests.sh
       env: null
       name: "System Tests TPM 1.2"
     - stage: Packaging and System Tests
       script: 
-	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
             - .ci/system-tests/./run-system-tests-tpm2.sh
       env: null
       name: "System Tests TPM 2.0"
     - stage: Packaging and System Tests
       script: 
-	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
             - .ci/system-tests/./run-system-tests-tpm2-base-delta-bad.sh
       env: null
       name: "System Tests TPM 2.0 Base/Delta(Bad)"
     - stage: Packaging and System Tests
       script: 
-	    - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
+            - echo $DOCKER_PWD | docker login -u "$DOCKER_USER" --password-stdin 
             - .ci/system-tests/./run-system-tests-tpm2-base-delta-good.sh
       env: null
       name: "System Tests TPM 2.0 Base/Delta(Good)"