diff --git a/.gitignore b/.gitignore index dcea8476..b468183f 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ SPECS/ RPM/ SRPM/ PLUGIN_SOURCE/ +*.tar.gz # C++ Files # *.o @@ -131,3 +132,6 @@ HIRS_AttestationCA/src/main/java/hirs/attestationca/configuration/provisionerTpm # these files are copied over by ProvisionerTPM2 CMake build HIRS_ProvisionerTPM2/config/logging.properties HIRS_ProvisionerTPM2/scripts/tpm_aca_provision + +# tcg_rim_tool files +tools/tcg_rim_tool/generated_swidTag.swidtag diff --git a/tools/tcg_rim_tool/package.sh b/tools/tcg_rim_tool/package.sh index b3ac6c3f..d4636949 100755 --- a/tools/tcg_rim_tool/package.sh +++ b/tools/tcg_rim_tool/package.sh @@ -7,7 +7,7 @@ pushd $SCRIPT_DIR name="tcg_rim_tool" tar -cf $name.tar build.gradle gradle* src/ docs/ rim_fields.json keystore.jks scripts/ -gzip $name.tar +gzip -f $name.tar if [ -d rpmbuild ]; then rm -rf rpmbuild fi diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/utils/HashSwid.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/utils/HashSwid.java index 1b33f6bf..ca366f6a 100644 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/utils/HashSwid.java +++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/utils/HashSwid.java @@ -49,7 +49,7 @@ public class HashSwid { } /** - * This method creates the hash based on the provided algorithm and salt + * This method creates the hash based on the provided algorithm * only accessible through helper methods. * * This method assumes an input file that is small enough to read in its @@ -57,7 +57,6 @@ public class HashSwid { * getHashValue() below. * * @param filepath file contents to hash - * @param salt random value to make the hash stronger * @param sha the algorithm to use for the hash * @return */ diff --git a/tools/tcg_rim_tool/tcg_rim_tool.spec b/tools/tcg_rim_tool/tcg_rim_tool.spec index 379d8e4d..84230204 100644 --- a/tools/tcg_rim_tool/tcg_rim_tool.spec +++ b/tools/tcg_rim_tool/tcg_rim_tool.spec @@ -22,7 +22,7 @@ rm -f /opt/hirs/rimtool/%{name}*.jar ./gradlew build %install -mkdir -p %{buildroot}/opt/hirs/rimtool/ %{buildroot}/usr/local/bin/rim/ +mkdir -p %{buildroot}/opt/hirs/rimtool/ %{buildroot}/usr/local/bin cp build/libs/%{name}-%{version}.jar %{buildroot}/opt/hirs/rimtool/ cp ./rim_fields.json %{buildroot}/opt/hirs/rimtool/ cp ./keystore.jks %{buildroot}/opt/hirs/rimtool/ @@ -33,8 +33,10 @@ ln -sf /opt/hirs/rimtool/scripts/rimtool.sh %{buildroot}/usr/local/bin/rim /opt/hirs/rimtool/%{name}-%{version}.jar /opt/hirs/rimtool/rim_fields.json /opt/hirs/rimtool/keystore.jks -/opt/hirs/rimtool/scripts/rimtool.sh -/usr/local/bin/rim/ +/opt/hirs/rimtool/scripts +/usr/local/bin/rim + +%attr(755, root, root) /opt/hirs/rimtool/scripts/rimtool.sh %changelog * Mon Jun 15 2020 chubtub