ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-18 02:39:56 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update version to 2.0.0

Browse Source
This commit is contained in:
chubtub 2020-11-10 15:39:47 -05:00
parent 43208332ae
commit dbfdcdf9fd
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/tcg_rim_tool/build.gradle
View File

@ -1,5 +1,5 @@
apply plugin: 'java'
version = '1.0'
version = '2.0.0'
repositories {
mavenCentral()

2
tools/tcg_rim_tool/scripts/rimtool.sh
View File

@ -3,6 +3,6 @@
# Calls the the_tcg_rim_tool and passes in parameters
scriptDir=$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")
baseDir=${scriptDir%/*}
jar="tcg_rim_tool-1.0.jar";
jar="tcg_rim_tool-2.0.0.jar";
java -jar $baseDir/$jar "$@"

4
tools/tcg_rim_tool/src/test/java/hirs/swid/TestSwidTagGateway.java
View File

@ -54,7 +54,7 @@ public class TestSwidTagGateway {
gateway.setPemCertificateFile(SIGNING_CERT_FILE);
gateway.setPemPrivateKeyFile(PRIVATE_KEY_FILE);
gateway.generateSwidTag(DEFAULT_OUTPUT);
expectedFile = (InputStream) TestSwidTagGateway.class.getClassLoader().getResourceAsStream(DEFAULT_WITH_CERT);
expectedFile = TestSwidTagGateway.class.getClassLoader().getResourceAsStream(DEFAULT_WITH_CERT);
Assert.assertTrue(compareFileBytesToExpectedFile(DEFAULT_OUTPUT));
}
@ -67,7 +67,7 @@ public class TestSwidTagGateway {
gateway.setDefaultCredentials(true);
gateway.setJksKeystoreFile(JKS_KEYSTORE_FILE);
gateway.generateSwidTag(DEFAULT_OUTPUT);
expectedFile = (InputStream) TestSwidTagGateway.class.getClassLoader().getResourceAsStream(DEFAULT_NO_CERT);
expectedFile = TestSwidTagGateway.class.getClassLoader().getResourceAsStream(DEFAULT_NO_CERT);
Assert.assertTrue(compareFileBytesToExpectedFile(DEFAULT_OUTPUT));
}

6
tools/tcg_rim_tool/tcg_rim_tool.spec
View File

@ -1,5 +1,5 @@
Name: tcg_rim_tool
Version: 1.0
Version: 2.0.0
Release: 1%{?dist}
Summary: A java command-line tool to create PC client root RIM
@ -23,7 +23,7 @@ rm -f /opt/hirs/rimtool/%{name}*.jar
%install
mkdir -p %{buildroot}/opt/hirs/rimtool/ %{buildroot}/usr/local/bin
cp build/libs/%{name}-%{version}.jar %{buildroot}/opt/hirs/rimtool/
cp build/libs/tools/%{name}-%{version}.jar %{buildroot}/opt/hirs/rimtool/
cp ./rim_fields.json %{buildroot}/opt/hirs/rimtool/
cp ./keystore.jks %{buildroot}/opt/hirs/rimtool/
cp -r ./scripts/ %{buildroot}/opt/hirs/rimtool/
@ -39,6 +39,8 @@ ln -sf /opt/hirs/rimtool/scripts/rimtool.sh %{buildroot}/usr/local/bin/rim
%attr(755, root, root) /opt/hirs/rimtool/scripts/rimtool.sh
%changelog
* Tue Nov 10 2020 chubtub
- Second release
* Mon Jun 15 2020 chubtub
- First release
* Mon Jan 6 2020 chubtub