ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-21 22:07:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor comment changes to TCGEventLogTest

Browse Source
This commit is contained in:
iadgovuser58 2023-07-13 17:48:34 -04:00
parent 2db07c7c77
commit 166391c4d4
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
HIRS_Utils/src/test/java/hirs/utils/tpm/eventlog/TCGEventLogTest.java
View File

@ -18,11 +18,9 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
//import static org.junit.jupiter.api.Assertions.*;
public class TCGEventLogTest {
//class TCGEventLogTest {
private static final String DEFAULT_EVENT_LOG = "/tcgeventlog/TpmLog.bin";
private static final String DEFAULT_EXPECTED_PCRS = "/tcgeventlog/TpmLogExpectedPcrs.txt";
@ -76,21 +74,17 @@ public class TCGEventLogTest {
LOGGER.error("\ntestTCGEventLogProcessorParser error with PCR " + i);
}
}
//Assert.assertTrue(testPass);
assertTrue(testPass);
// Test 2 get an individual PCR
String pcr3 = evlog.getExpectedPCRValue(3);
//Assert.assertEquals(pcr3, pcrFromLog[3]);
assertThat(pcr3, equalTo(pcrFromLog[3]));
// Test 3 check the Algorithm Identifiers used in the log
String algStr = evlog.getEventLogHashAlgorithm();
//Assert.assertEquals(algStr, "TPM_ALG_SHA256");
assertThat(algStr, equalTo("TPM_ALG_SHA256"));
int id = evlog.getEventLogHashAlgorithmID();
//Assert.assertEquals(id, TcgTpmtHa.TPM_ALG_SHA256);
assertThat(id, equalTo(TcgTpmtHa.TPM_ALG_SHA256));
LOGGER.debug("OK. Parsing of a Crypto Agile Format Success");
@ -123,21 +117,17 @@ public class TCGEventLogTest {
LOGGER.error("\ntestTCGEventLogProcessorParser error with PCR " + i);
}
}
//Assert.assertTrue(testPass);
assertTrue(testPass);
// Test 2 get an individual PCR
String pcr0 = evlog.getExpectedPCRValue(0);
//Assert.assertEquals(pcr0, pcrFromLog[0]);
assertThat(pcr0, equalTo(pcrFromLog[0]));
// Test 3 check the Algorithm Identifiers used in the log
String algStr = evlog.getEventLogHashAlgorithm();
//Assert.assertEquals(algStr, "TPM_ALG_SHA1");
assertThat(algStr, equalTo("TPM_ALG_SHA1"));
int id = evlog.getEventLogHashAlgorithmID();
//Assert.assertEquals(id, TcgTpmtHa.TPM_ALG_SHA1);
assertThat(id, equalTo(TcgTpmtHa.TPM_ALG_SHA1));
LOGGER.debug("OK. Parsing of a SHA1 formatted TCG Event Log Success");