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

Merge pull request #790 from nsacyber/v3_issue-789

Browse Source 
Modify rimtool to properly namespace timestamp elements
This commit is contained in:
chubtub 2024-06-20 10:53:30 -04:00 committed by GitHub
commit 7037429f06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java
View File

@ -718,11 +718,13 @@ public class SwidTagGateway {
try {
byte[] counterSignature = Base64.getEncoder().encode(
Files.readAllBytes(Paths.get(timestampArgument)));
timeStampElement = doc.createElementNS(SwidTagConstants.RFC3852_NS, "TimeStamp");
timeStampElement = doc.createElementNS(SwidTagConstants.RFC3852_NS,
SwidTagConstants.RFC3852_PFX + ":TimeStamp");
timeStampElement.setAttributeNS("http://www.w3.org/2000/xmlns/",
"xmlns:" + SwidTagConstants.RFC3852_PFX,
SwidTagConstants.RFC3852_NS);
timeStampElement.setAttribute(SwidTagConstants.DATETIME,
timeStampElement.setAttributeNS(SwidTagConstants.RFC3852_NS,
SwidTagConstants.RFC3852_PFX + ":" + SwidTagConstants.DATETIME,
new String(counterSignature));
} catch (IOException e) {
e.printStackTrace();
@ -730,15 +732,17 @@ public class SwidTagGateway {
}
break;
case "RFC3339":
timeStampElement = doc.createElementNS(SwidTagConstants.RFC3339_NS, "TimeStamp");
timeStampElement = doc.createElementNS(SwidTagConstants.RFC3339_NS,
SwidTagConstants.RFC3339_PFX + ":TimeStamp");
timeStampElement.setAttributeNS("http://www.w3.org/2000/xmlns/",
"xmlns:" + SwidTagConstants.RFC3339_PFX,
SwidTagConstants.RFC3339_NS);
"xmlns:" + SwidTagConstants.RFC3339_PFX, SwidTagConstants.RFC3339_NS);
if (timestampArgument.isEmpty()) {
timeStampElement.setAttribute(SwidTagConstants.DATETIME,
timeStampElement.setAttributeNS(SwidTagConstants.RFC3339_NS,
SwidTagConstants.RFC3339_PFX + ":" + SwidTagConstants.DATETIME,
LocalDateTime.now().toString());
} else {
timeStampElement.setAttribute(SwidTagConstants.DATETIME,
timeStampElement.setAttributeNS(SwidTagConstants.RFC3339_NS,
SwidTagConstants.RFC3339_PFX + ":" + SwidTagConstants.DATETIME,
timestampArgument);
}
break;