Commit Graph

97 Commits

Author SHA1 Message Date
Cyrus
c0cee9d597 Fixed a typo and included files I didn't on the initial push 2023-12-20 13:10:58 -05:00
chubtub
d325c04764 Migrate javax.xml.bind to jakarta. Delete hirs.swid.xjc package and update SwidTagConstants class to reference hirs.utils.xjc. 2023-11-30 15:08:25 -05:00
chubtub
0236a6b9c6 Add methods to ReferenceManifestValidator to facilitate swidtag XML validation. Modify rimtool classes to reference ReferenceManifestValidator. Modify build.gradle to build a fat jar. 2023-11-03 13:27:12 -04:00
chubtub
55936806d7 Revert "Merge pull request #606 from nsacyber/v3_issue-596"
This reverts commit 071e89a44f, reversing
changes made to 45d550729f.
2023-11-01 10:03:34 -04:00
chubtub
bfa30ca186 Change references in ACA and ACAPortal to HIRS_Utils package for migrated classes. Revert change to gradle.properties file. 2023-10-16 13:50:49 -04:00
chubtub
5f6a620ec2 Revert "Merge pull request #583 from nsacyber/v3_issue-563"
This reverts commit f725f90392, reversing
changes made to 25101314a2.
2023-09-27 09:32:58 -04:00
iadgovuser26
9998fa7f22 Merge branch 'main' into v3_issue_578-rpm_update 2023-09-19 16:31:21 -04:00
chubtub
66501c9444 Revert rimtool SwidTagValidator class changes, these will be in issue-582.
Revert SupportReferenceManifest migration to rimtool, this class will remain
in the ACA.
2023-09-14 00:05:50 -04:00
chubtub
38894e7ce5 WIP: migrate RIM classes from ACA to rimtool 2023-09-12 11:30:05 -04:00
iadgovuser26
cb4ad4d51a Updated gradle to v8.3 and nebula to 11.4.0 2023-09-06 16:10:16 -04:00
iadgovuser26 iadgovuser26@empire.eclipse.ncsc.mil
ef65c6ad8b updated with package for tcg_rim_tool [no ci] 2023-03-17 14:47:10 -04:00
chubtub
7fdd4b1e44 Added unit tests for timestamps 2023-01-09 11:47:30 -05:00
chubtub
b7f9c52fcb Consolidate timestamp parameters into --timestamp RFC3(339|852). Added a validator class for the parameter arguments. 2022-12-29 01:55:19 -05:00
chubtub
6a84bb50c5 Merge branch 'java_xml_timestamp' into issue-493 2022-12-19 18:32:40 -05:00
chubtub
f74bc49120 Suppoort user input for RFC3339 timestamps 2022-12-19 10:39:10 -05:00
chubtub
307d0b3fe4 Read in counter signature file contents, encode in base64, and place in Timestamp element 2022-12-08 08:15:55 -05:00
chubtub
054699d14d Add commandline support for passing in a countersignature file for RFC3852 timestamps 2022-12-08 08:15:55 -05:00
chubtub
2252270d94 Modify help text 2022-12-08 08:15:55 -05:00
chubtub
b5681411c0 Updated references of RFC3161 to RFC3852 2022-12-08 08:15:55 -05:00
chubtub
075d68664f If no timestamp format is given a timestamp is not included in the resulting XML. Updated unit tests. 2022-12-08 08:15:55 -05:00
chubtub
fcf59290fe Modify gateway class to insert a timestamp according to user selected format 2022-12-08 08:15:55 -05:00
chubtub
464abbf156 Modify Main and Commander classes to support options for RFC3161 and RFC3339 2022-12-08 08:15:55 -05:00
chubtub
233171893b Add constants to support separate namespaces for RFC3161 and RCF3339. 2022-12-08 08:15:55 -05:00
chubtub
106e1fef76 Clean up SwidTagConstants class values 2022-12-08 08:15:55 -05:00
chubtub
dffcbf59bd Add support for timestamping a signature 2022-12-08 08:15:50 -05:00
chubtub
59ef355326 Modify help text 2022-12-06 06:50:53 -05:00
chubtub
fbcaadee31 Updated references of RFC3161 to RFC3852 2022-11-21 14:04:11 -05:00
chubtub
d01b5de478 If no timestamp format is given a timestamp is not included in the resulting XML. Updated unit tests. 2022-10-26 07:51:25 -04:00
chubtub
ed2797735e Modify gateway class to insert a timestamp according to user selected format 2022-09-21 10:52:32 -04:00
chubtub
97ccab0473 Modify Main and Commander classes to support options for RFC3161 and RFC3339 2022-09-20 00:19:01 -04:00
chubtub
1fccd3a222 Add constants to support separate namespaces for RFC3161 and RCF3339. 2022-09-13 10:24:38 -04:00
chubtub
68b11ce96d Clean up SwidTagConstants class values 2022-09-12 10:14:24 -04:00
chubtub
25e77a6173 Merge branch 'master' into java_xml_timestamp 2022-09-08 20:37:26 -04:00
chubtub
ddbc13d2bb Add support for timestamping a signature 2022-09-08 20:35:42 -04:00
chubtub
e72ffe1cbb Debug failing unit tests 2022-08-26 10:11:35 -04:00
chubtub
20903c6bea Merge branch 'master' into issue-462 2022-08-25 13:01:39 -04:00
chubtub
1836620f98 Moved Microsoft library program to its own directory under HIRS/tools/ 2022-07-21 15:01:57 -04:00
chubtub
6a173fe162 This program generates a signature that passes validation by the rimtool. 2022-07-19 18:06:57 -04:00
chubtub
223fc15cc4 This program successfully validates a rimtool-signed swidtag 2022-07-18 12:57:27 -04:00
chubtub
de790ed7b2 Clean up unit tests 2022-04-15 10:39:35 -04:00
chubtub
4b3c01f990 Moved KeyValue processing to KeySelector inner class 2022-04-15 10:28:07 -04:00
chubtub
e5e6db75f4 WIP: Modify validation code and unit tests to account for embedded public key. 2022-04-15 10:28:07 -04:00
chubtub
0a618b3796 Modify default attributes file path. Add unit test for embed option. 2022-04-15 10:28:06 -04:00
chubtub
392821a2b9 Add option to explicitly embed a user-provided public key into signed swidtag. 2022-04-15 10:28:03 -04:00
chubtub
afbbf16583 Added checks and error handling for missing required JSON fields and/or input parameters. 2022-04-14 15:40:05 -04:00
chubtub
3353bbf40e Check Directory and File for supportRIMFormat. An empty value defaults to TCG_EventLog_Assertion. Update unit tests. 2022-03-14 14:21:18 -04:00
chubtub
7ca015896e Add supportRIMFormat attribute under Payload element, with default value of TCG_EventLog_Assertion. 2022-03-08 18:57:34 -05:00
chubtub
acfe67a546 Prevent jar file from being truncated by packaging. 2022-03-04 10:19:06 -05:00
chubtub
f8c593c4b7 Add git timestamp and hash to the rpm name. Also centralize version number to package.sh. 2022-03-04 10:19:06 -05:00
chubtub
df9cc298ff Require the user to give signing credentials via -k and -p, or indicate default credentials via -d. 2022-01-04 17:12:53 -05:00