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

Merge branch 'master' into Unmatched-component-refactor

Browse Source
This commit is contained in:
Cyrus 2021-02-08 15:23:21 -05:00
commit 5e4dc8ce82
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HIRS_AttestationCAPortal/build.gradle
View File

@ -34,7 +34,7 @@ dependencies {
compile libs.pci_ids compile libs.pci_ids
compile libs.servlet_api compile libs.servlet_api
compile libs.spring_webmvc compile libs.spring_webmvc
compile 'org.springframework:spring-context-support:4.2.1.RELEASE' compile 'org.springframework:spring-context-support:4.3.30.RELEASE'
compile 'org.hibernate:hibernate-validator:5.3.4.Final' compile 'org.hibernate:hibernate-validator:5.3.4.Final'
compileOnly libs.checkstyle compileOnly libs.checkstyle

3
HIRS_Utils/src/test/java/hirs/persist/CertificateSelectorTest.java
View File

@ -27,7 +27,8 @@ public class CertificateSelectorTest extends SpringPersistenceTest {
*/ */
@Test @Test
public void testConstruction() { public void testConstruction() {
Assert.notNull(CertificateAuthorityCredential.select(certMan)); Assert.notNull(CertificateAuthorityCredential.select(certMan),
"testConstruction is not null.");
} }
/** /**

2
HIRS_Utils/src/test/java/hirs/tpm/eventlog/events/TCGEventLogEventsTest.java
View File

@ -139,7 +139,7 @@ public final void testHandOffTables() throws IOException {
EvEfiHandoffTable hTable = new EvEfiHandoffTable(eventBytes); EvEfiHandoffTable hTable = new EvEfiHandoffTable(eventBytes);
Assert.assertEquals(hTable.getNumberOfTables(), 1); Assert.assertEquals(hTable.getNumberOfTables(), 1);
String tableINfo = hTable.toString(); String tableINfo = hTable.toString();
Assert.assertTrue(tableINfo.toString(). Assert.assertFalse(tableINfo.toString().
contains("UEFI industry standard table type = SMBIOS3_TABLE_GUID")); contains("UEFI industry standard table type = SMBIOS3_TABLE_GUID"));
} }

2
HIRS_Utils/src/test/java/hirs/validation/SupplyChainCredentialValidatorTest.java
View File

@ -1148,7 +1148,7 @@ public class SupplyChainCredentialValidatorTest {
PlatformCredential pc = new PlatformCredential(certBytes); PlatformCredential pc = new PlatformCredential(certBytes);
String expectedMessage = "Can't validate platform credential without an " String expectedMessage = "Can't validate platform credential without an "
+ "intitialized trust store"; + "initialized trust store";
AppraisalStatus result = supplyChainCredentialValidator.validatePlatformCredential( AppraisalStatus result = supplyChainCredentialValidator.validatePlatformCredential(
pc, emptyKeyStore, true); pc, emptyKeyStore, true);

20
build.gradle
View File

@ -137,17 +137,17 @@ subprojects {
reflections: 'org.reflections:reflections:0.9.9-RC1', reflections: 'org.reflections:reflections:0.9.9-RC1',
servlet_api: 'javax.servlet:servlet-api:2.5', servlet_api: 'javax.servlet:servlet-api:2.5',
slf4j: 'org.slf4j:slf4j-api:1.7.13', slf4j: 'org.slf4j:slf4j-api:1.7.13',
spring_core: ['org.springframework:spring-aop:4.2.3.RELEASE', spring_core: ['org.springframework:spring-aop:4.3.30.RELEASE',
'org.springframework:spring-beans:4.2.3.RELEASE', 'org.springframework:spring-beans:4.3.30.RELEASE',
'org.springframework:spring-context:4.2.3.RELEASE', 'org.springframework:spring-context:4.3.30.RELEASE',
'org.springframework:spring-expression:4.2.3.RELEASE', 'org.springframework:spring-expression:4.3.30.RELEASE',
'org.springframework:spring-orm:4.2.3.RELEASE'], 'org.springframework:spring-orm:4.3.30.RELEASE'],
spring_msg: 'org.springframework:spring-messaging:4.2.3.RELEASE', spring_msg: 'org.springframework:spring-messaging:4.3.30.RELEASE',
spring_plugin: 'org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE', spring_plugin: 'org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE',
spring_retry: 'org.springframework.retry:spring-retry:1.2.0.RELEASE', spring_retry: 'org.springframework.retry:spring-retry:1.2.2.RELEASE',
spring_test: 'org.springframework:spring-test:4.2.3.RELEASE', spring_test: 'org.springframework:spring-test:4.3.30.RELEASE',
spring_web: 'org.springframework:spring-web:4.2.3.RELEASE', spring_web: 'org.springframework:spring-web:4.3.30.RELEASE',
spring_webmvc: 'org.springframework:spring-webmvc:4.2.3.RELEASE', spring_webmvc: 'org.springframework:spring-webmvc:4.3.30.RELEASE',
testng: 'org.testng:testng:6.8.8', testng: 'org.testng:testng:6.8.8',
xml_rpc_client: 'org.apache.xmlrpc:xmlrpc-client:3.1.3', xml_rpc_client: 'org.apache.xmlrpc:xmlrpc-client:3.1.3',
] ]