Merge pull request #866 from nsacyber/v3_issue_825-remove-hirs_provis…

…ionertpm2 [#825] Delete HIRS Provisioner TPM2
nsacyber · Nov 15, 2024 · e1f5907 · e1f5907
2 parents d0faa39 + 86d2084
commit e1f5907
Show file tree

Hide file tree

Showing 53 changed files with 15 additions and 7,933 deletions.
diff --git a/HIRS_AttestationCA/build.gradle b/HIRS_AttestationCA/build.gradle
@@ -70,10 +70,10 @@ configurations.checkstyle {
     }
 }
 checkstyleMain {
-    source ='src/main/java'
+    source = 'src/main/java'
 }
 checkstyleTest {
-    source ='src/test/java'
+    source = 'src/test/java'
 }
 tasks.withType(Checkstyle) {
     reports {
@@ -82,16 +82,16 @@ tasks.withType(Checkstyle) {
     }
 }
 protobuf {
-  protoc {
-    artifact = 'com.google.protobuf:protoc:3.24.3'
-  }
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.24.3'
+    }
 }
 sourceSets {
-  main {
-    proto {
-      srcDir '../HIRS_ProvisionerTPM2/src'
+    main {
+        proto {
+            srcDir '../HIRS_Provisioner.NET/hirs/Resources'
+        }
     }
-  }
 }
 
 test {

diff --git a/HIRS_AttestationCA/config/genJavaProtoBuf.sh b/HIRS_AttestationCA/config/genJavaProtoBuf.sh
@@ -7,10 +7,10 @@
 dir=$(pwd)
 # Relative paths are different when building locally versus on CI
 if [[ "$dir" == *"package"* ]]; then
-  SRC_DIR=$dir/../../../../../../HIRS_ProvisionerTPM2/src
+  SRC_DIR=$dir/../../../../../../HIRS_Provisioner.NET/hirs/Resources
   DEST_DIR=$dir/../src/main/java
 else
-  SRC_DIR=../../HIRS_ProvisionerTPM2/src
+  SRC_DIR=../../HIRS_Provisioner.NET/hirs/Resources
   DEST_DIR=../src/main/java
 fi
 protoc -I=$SRC_DIR --java_out=$DEST_DIR $SRC_DIR/ProvisionerTpm2.proto
diff --git a/HIRS_AttestationCAPortal/config/genJavaProtoBuf.sh b/HIRS_AttestationCAPortal/config/genJavaProtoBuf.sh
@@ -7,10 +7,10 @@
 dir=$(pwd)
 # Relative paths are different when building locally versus on CI
 if [[ "$dir" == *"package"* ]]; then
-  SRC_DIR=$dir/../../../../../../HIRS_ProvisionerTPM2/src
+  SRC_DIR=$dir/../../../../../../HIRS_Provisioner.NET/hirs/Resources
   DEST_DIR=$dir/../src/main/java
 else
-  SRC_DIR=../../HIRS_ProvisionerTPM2/src
+  SRC_DIR=../../HIRS_Provisioner.NET/hirs/Resources
   DEST_DIR=../src/main/java
 fi
 protoc -I=$SRC_DIR --java_out=$DEST_DIR $SRC_DIR/ProvisionerTpm2.proto
diff --git a/HIRS_ProvisionerTPM2/CMakeLists.txt b/HIRS_ProvisionerTPM2/CMakeLists.txt