Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dependency-submission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 25

- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v4
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '25'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down
22 changes: 8 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ plugins {
id 'java'
id 'com.github.spotbugs' version '6.4.8'
id 'com.netflix.nebula.ospackage' version '12.2.0'
id 'org.owasp.dependencycheck' version '12.1.9'
id 'org.owasp.dependencycheck' version '12.2.0'
}

apply plugin: "checkstyle"
apply plugin: "com.github.spotbugs"

checkstyle {
toolVersion = '12.3.1'
toolVersion = '13.2.0'
configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")
}

Expand Down Expand Up @@ -107,14 +107,10 @@ configurations.configureEach {
details.requested.name == 'assertj-core') {
details.useVersion '3.27.7' // Force upgraded assertj-core version
}
if (details.requested.group == 'io.airlift' &&
details.requested.name == 'aircompressor') {
details.useVersion '3.5' // Force upgraded aircompressor version
}
if (details.requested.group == 'org.bouncycastle' &&
details.requested.name == 'bcprov-jdk15on') {
details.useVersion '1.83' // Force upgraded bcprov-jdk15on version
}
}
resolutionStrategy.dependencySubstitution {
substitute module('io.airlift:aircompressor') using module('io.airlift:aircompressor-v3:3.5')
substitute module('org.bouncycastle:bcprov-jdk15on') using module('org.bouncycastle:bcprov-jdk18on:1.83')
}
}

Expand Down Expand Up @@ -168,11 +164,9 @@ def buildTime = { ->

def gitHash = { ->
def stdout = new ByteArrayOutputStream()
exec {
return providers.exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = stdout
}
return stdout.toString().trim()
}.standardOutput.asText.get().trim()
}

def projectVersion = rootProject.file('VERSION').text.trim()
Expand Down
4 changes: 2 additions & 2 deletions gradle/versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
bouncyCastleVersion = "1.83"
jcommanderVersion = "2.0"
jcommanderVersion = "3.0"
lombokVersion = "1.18.42"

#test dependencies versions
jupiterVersion = "6.0.2"
jupiterVersion = "6.0.3"

[libraries]
bouncycastle = { module = "org.bouncycastle:bcmail-jdk18on", version.ref = "bouncyCastleVersion" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 2 additions & 5 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion hirs
Submodule hirs updated 87 files
+2 −2 .ci/docker/Dockerfile.aca-rocky
+20 −3 .ci/docker/Dockerfile.aca-rocky-ci
+12 −51 .ci/docker/Dockerfile.aca-windows
+0 −15 .ci/docker/Dockerfile.amazonlinux2
+0 −9 .ci/docker/Dockerfile.centos7
+0 −38 .ci/docker/Dockerfile.rocky
+0 −58 .ci/docker/Dockerfile.rocky88ci
+68 −0 .ci/docker/Dockerfile.rocky9ci
+0 −19 .ci/docker/Dockerfile.tpm2provisioner
+6 −6 .ci/docker/Dockerfile.tpm2provisioner-dotnet-ci
+0 −15 .ci/docker/Dockerfile.tpmprovisioner
+0 −13 .ci/docker/Dockerfile.ubuntu18
+4 −2 .ci/docker/Dockerfile.ubuntu24ci
+32 −32 .ci/docker/docker-compose-system-test.yml
+1 −1 .ci/setup/container/setup_tpm2provisioner_dotnet.sh
+4 −2 .ci/system-tests/run_system_tests.sh
+4 −3 .ci/system-tests/setup_system_tests.sh
+4 −4 .github/workflows/create_aca_images.yml
+19 −9 .github/workflows/dotnet_provisioner_unit_tests.yml
+11 −11 .github/workflows/hirs_package_linux.yml
+5 −5 .github/workflows/hirs_unit_tests.yml
+7 −8 .github/workflows/rim_tests.yml
+3 −3 .github/workflows/system_test.yml
+5 −2 HIRS_AttestationCA/build.gradle
+2 −3 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/AbstractEntity.java
+1 −1 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/Certificate.java
+299 −30 ...tationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/EndorsementCredential.java
+75 −42 .../main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/CommonCriteriaMeasures.java
+13 −11 ...stationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/FIPSLevel.java
+0 −6 ...c/main/java/hirs/attestationca/persist/entity/userdefined/certificate/attributes/TPMSecurityAssertions.java
+0 −2 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/NetworkInfo.java
+0 −1 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/TPMInfo.java
+18 −0 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/exceptions/NonUniqueSKIException.java
+100 −105 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/service/DevicePageService.java
+0 −184 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/type/InetAddressType.java
+0 −197 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/type/X509CertificateType.java
+0 −1 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/type/package-info.java
+9 −5 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/util/CredentialHelper.java
+7 −4 HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/validation/FirmwareScvValidator.java
+6 −6 ...ationCA/src/test/java/hirs/attestationca/persist/entity/userdefined/certificate/PlatformCredentialTest.java
+20 −9 HIRS_AttestationCAPortal/build.gradle
+0 −13 HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/HIRSDbInitializer.java
+147 −25 HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/utils/CertificateStringMapBuilder.java
+5 −5 HIRS_AttestationCAPortal/src/main/resources/log4j2-spring.win.xml
+844 −339 HIRS_AttestationCAPortal/src/main/resources/templates/certificate-details.html
+5 −5 HIRS_AttestationCAPortal/src/main/resources/templates/endorsement-key-credentials.html
+2 −2 HIRS_AttestationCAPortal/src/main/resources/templates/fragments/details-viewer.html
+2 −2 HIRS_AttestationCAPortal/src/main/resources/templates/fragments/download-info.html
+2 −0 HIRS_AttestationCAPortal/src/main/resources/templates/fragments/field-displayer.html
+2 −2 HIRS_AttestationCAPortal/src/main/resources/templates/fragments/file-chooser.html
+2 −2 HIRS_AttestationCAPortal/src/main/resources/templates/help.html
+5 −5 HIRS_AttestationCAPortal/src/main/resources/templates/idevid-certificates.html
+4 −4 HIRS_AttestationCAPortal/src/main/resources/templates/issued-certificates.html
+2 −2 HIRS_AttestationCAPortal/src/main/resources/templates/layout.html
+19 −19 HIRS_AttestationCAPortal/src/main/resources/templates/platform-credentials.html
+17 −17 HIRS_AttestationCAPortal/src/main/resources/templates/policy.html
+5 −5 HIRS_AttestationCAPortal/src/main/resources/templates/reference-manifests.html
+7 −7 HIRS_AttestationCAPortal/src/main/resources/templates/trust-chain.html
+14 −13 HIRS_AttestationCAPortal/src/main/resources/templates/validation-reports.html
+0 −1 ...nCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageControllerTest.java
+2 −3 ...Portal/src/test/java/hirs/attestationca/portal/page/controllers/TrustChainManagementPageControllerTest.java
+18 −19 HIRS_Provisioner.NET/hirs/HIRS_Provisioner.NET.csproj
+11 −8 HIRS_Provisioner.NET/hirsTest/hirsTest.csproj
+2 −2 HIRS_Provisioner.NET/tools/pcrextend/pcrextend.csproj
+2 −0 HIRS_Structs/build.gradle
+2 −0 HIRS_Utils/build.gradle
+3 −3 HIRS_Utils/src/main/java/hirs/utils/VersionHelper.java
+37 −10 HIRS_Utils/src/main/java/hirs/utils/rim/unsignedRim/GenericRim.java
+37 −28 HIRS_Utils/src/main/java/hirs/utils/rim/unsignedRim/cbor/ietfCorim/CoRimParser.java
+79 −53 HIRS_Utils/src/main/java/hirs/utils/rim/unsignedRim/cbor/ietfCoswid/CoswidBuilder.java
+13 −9 HIRS_Utils/src/main/java/hirs/utils/rim/unsignedRim/cbor/ietfCoswid/CoswidConfigValidator.java
+74 −50 HIRS_Utils/src/main/java/hirs/utils/rim/unsignedRim/cbor/ietfCoswid/CoswidParser.java
+59 −58 HIRS_Utils/src/test/java/hirs/utils/rim/unsignedRim/cbor/ietfCoswid/CoswidItemsTest.java
+13 −10 HIRS_Utils/src/test/java/hirs/utils/rim/unsignedRim/cbor/ietfCoswid/CoswidParserTest.java
+119 −56 README.md
+26 −34 build.gradle
+9 −7 gradle/versions.toml
+ gradle/wrapper/gradle-wrapper.jar
+2 −1 gradle/wrapper/gradle-wrapper.properties
+22 −18 gradlew
+13 −12 gradlew.bat
+8 −3 tools/tcg_eventlog_tool/build.gradle
+1 −1 tools/tcg_eventlog_tool/gradle/wrapper/gradle-wrapper.properties
+3 −1 tools/tcg_rim_tool/README.md
+10 −4 tools/tcg_rim_tool/build.gradle
+2 −1 tools/tcg_rim_tool/gradle/wrapper/gradle-wrapper.properties
+3 −0 tools/tcg_rim_tool/src/test/java/hirs/swid/TestSwidTagGateway.java