Commit Graph

134 Commits

Author SHA1 Message Date
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
chubtub
064dab89c8 Change from com.eclipsesource.json package to javax.json for parsing 2021-11-10 12:59:13 -05:00
chubtub
d2d2b9a494 Remove KeyValue element from signed swidtag. Update error message for missing signer cert. Update version number. 2021-07-23 17:41:31 -04:00
chubtub
8958085b60 Search for signing cert by SKID instead of PK 2021-07-16 16:46:31 -04:00
chubtub
ce090558a6 Parse public key or signing cert from XML properly. Disallow a single cert for validation. Update javadocs 2021-07-13 10:42:46 -04:00
chubtub
cfd04ae15a Rename keystore to truststore. Read truststore file for validation if given. 2021-07-07 15:21:24 -04:00
chubtub
6acfb13ce8 Add cert path validation to SwidTagValidator class. Modify CredentialParser class to support changes. 2021-07-07 07:48:10 -04:00
Cyrus
8abffb54e2
Merge pull request #372 from nsacyber/base64-decode-error
Base64 decode exception
2021-06-25 09:04:12 -04:00
Cyrus
620e389aab Added a file 2021-06-21 11:29:10 -04:00
chubtub
3accb244e9 Catch DecoderException in the tcg_rim_tool CredentialParser class. 2021-06-10 12:34:38 -04:00
chubtub
8335088259 Revert "Add validation of base64 encoding for payload file hash attribute."
This reverts commit 51b92f7673.
2021-05-26 15:20:23 -04:00
chubtub
51b92f7673 Add validation of base64 encoding for payload file hash attribute. 2021-05-25 12:05:56 -04:00
chubtub
4679264897 Fix path for jar file 2020-11-20 12:42:07 -05:00
chubtub
dbfdcdf9fd Update version to 2.0.0 2020-11-10 15:39:47 -05:00
chubtub
43208332ae Add default keystore in case of no input 2020-11-10 08:04:41 -05:00
chubtub
00d3846dfe Remove default keystore file constant, this file is now an input parameter. 2020-11-09 15:23:56 -05:00
chubtub
8a175b18f7 Move supportRIMFormat from Meta to Payload 2020-08-18 12:19:16 -04:00
iadgovuser26
e5ca8102a8
Update README.md 2020-08-12 12:03:02 +00:00
chubtub
52cb0ede34 Fix errors with firmware attributes. Move attributes under appropriate elements. 2020-08-06 17:38:54 -04:00
chubtub
33c20e8c70 Fix classpath error causing broken unit tests 2020-08-04 13:25:50 -04:00
chubtub
df6a864c2d
Merge pull request #284 from nsacyber/issue-273
[#273] Validate base RIM with external cert
2020-08-03 10:43:17 -04:00
iadgovuser26
e694242230
Update README.md
path fix in README.md
2020-07-23 16:38:24 -04:00
chubtub
dc25c983c1 Print AIA extension from validation cert 2020-07-23 10:06:49 -04:00
chubtub
6e36eee1ab Add -p option under -v to validate a self-signed base RIM with an external cert 2020-07-21 14:50:07 -04:00
chubtub
a0a2222554 Fix broken unit test from moving validation code to new class 2020-07-21 14:33:32 -04:00
chubtub
586d109e7f Move validation code to new class 2020-07-21 14:32:36 -04:00
chubtub
2b6a947986 Directory and File names are read from json, File size and hash are calculated from given -l <filepath> 2020-06-25 08:26:41 -04:00
chubtub
7045fc9978 Passing -l <filepath> to -v will verify the payload hash with <filepath> instead of the <File name=filepath> 2020-06-25 07:58:37 -04:00
iadgovuser26
1f860b5682
Updated with rim command line reference. 2020-06-24 07:00:29 -04:00
chubtub
c9c40e9bac Install link to /usr/local/bin 2020-06-19 09:15:02 -04:00
chubtub
4404d25f20 Revert "Revert changes to HashSwid class"
This reverts commit d850d69b1e8b14367b25c075dd8f61b30e558c02.
2020-06-19 07:29:20 -04:00
chubtub
3babe6cc2f Revert changes to HashSwid class 2020-06-19 07:29:20 -04:00
chubtub
a4e3fb38de Fixed unit test 2020-06-19 07:29:20 -04:00
chubtub
9b4eb49601 Add symlink to /usr/local/bin/rim during rpm install 2020-06-19 07:29:20 -04:00
iadgovuser26
fab55e4439
Added README.md with build instructions 2020-06-18 13:10:29 -04:00
chubtub
3747c1911e Update packaging script to install to /opt/hirs/rimtool 2020-06-16 08:11:12 -04:00
chubtub
64ddc39c2c Add validation of support RIM in payload 2020-06-15 17:50:18 -04:00
chubtub
c69affd4f6 Added a check against embedding a self-signed cert. Requires a support rim whose name, size, and hash are added to the payload. 2020-06-15 17:50:18 -04:00
iadgovuser26
586c29c0f3 Fixed merge conflicts 2020-06-10 16:51:47 -04:00
chubtub
8eda518b0a Add exit code 1 for failed validation 2020-06-08 06:50:46 -04:00
chubtub
6ae5a18f99 Implement --create, --attributes, --out, and --help in JCommander
Add KeyName (subjectKeyIdentifier) and KeyValue (public key) to KeyInfo element

Implement --privateKeyFile and --publicCertificate in JCommander

Implement -v in JCommander. Clean up unit tests.

Implement support for PKCS1 in CredentialParser class.

Truncate # symbol after parsing subject key identifier

Close input streams in CredentialParser class

Closes #237
2020-06-08 06:50:46 -04:00
iadgovuser26
7a9dc26df5 Added TCG Event Processing. 2020-05-01 09:18:14 -04:00
chubtub
3692262055 Clean up unit tests 2020-03-05 12:11:59 -05:00
chubtub
094efb37df Added CLI arg to control hiding/showing signature cert (default=hide) 2020-02-27 08:44:26 -05:00
chubtub
1f52dd3c27
[#217] Support reading conf settings from a json file (#218)
* Support reading conf settings from a json file

* Add optional RIM attributes

* Add xml signature element

* New commandline arguments for attributes conf file and privatekey or cert specification

* Add fields to satisfy NIST checks

* Print generated base rim contents to console also
2020-02-21 07:43:40 -05:00
Tsai
917ca2dcdc Remove user documents 2020-01-07 12:40:31 -05:00
Tsai
72f2824668 Delete tar file 2020-01-06 16:16:34 -05:00
Tsai
68222971b2 Rename project to tcg_rim_tool and move under tools/ directory 2020-01-06 16:14:04 -05:00