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

Truncate # symbol after parsing subject key identifier

Browse Source
This commit is contained in:
chubtub 2020-03-27 09:26:19 -04:00
parent 2108d902a4
commit c317dcff26
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/tcg_rim_tool/src/main/java/hirs/swid/CredentialParser.java
View File

@ -181,7 +181,10 @@ public class CredentialParser {
if (extension != null) { if (extension != null) {
decodedValue = JcaX509ExtensionUtils.parseExtensionValue(extension).toString(); decodedValue = JcaX509ExtensionUtils.parseExtensionValue(extension).toString();
} }
//If there is a # symbol at the beginning of the string, remove it
if (decodedValue.startsWith("#")) {
decodedValue = decodedValue.substring(1);
}
return decodedValue; return decodedValue;
} }
} }

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

@ -574,7 +574,7 @@ public class SwidTagGateway {
} }
/** /**
* This method unmarshalls the swidtag found at [path] into a JAXBElement object * This method unmarshalls the swidtag found at [path] into a Document object
* and validates it according to the schema. * and validates it according to the schema.
* *
* @param path to the input swidtag * @param path to the input swidtag

2
tools/tcg_rim_tool/src/test/resources/generated_no_cert.swidtag
View File

@ -26,7 +26,7 @@ zu3HTmQfeRYs/c6Ck1k3bL1jnyWoNzhBqCuPYrZtPbv9opVP0YOxM5IjRkRgkZIDgYbh1k4WXw8O
/iIMZuVJDfKQJSNCTAZsIbUatGDQc/nOihLHdI90wG8zu9amgrl1AEKzH8z864Fan5uuXolfAaak /iIMZuVJDfKQJSNCTAZsIbUatGDQc/nOihLHdI90wG8zu9amgrl1AEKzH8z864Fan5uuXolfAaak
sLJl6RPCNcp+JNCXMMZiS8bmYPQnVJc1ze0I1A==</SignatureValue> sLJl6RPCNcp+JNCXMMZiS8bmYPQnVJc1ze0I1A==</SignatureValue>
<KeyInfo> <KeyInfo>
<KeyName>#2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName> <KeyName>2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName>
<KeyValue> <KeyValue>
<RSAKeyValue> <RSAKeyValue>
<Modulus>p3WVYaRJG7EABjbAdqDYZXFSTV1nHY9Ol9A5+W8t5xwBXBryZCGWxERGr5AryKWPxd+qzjj+cFpx <Modulus>p3WVYaRJG7EABjbAdqDYZXFSTV1nHY9Ol9A5+W8t5xwBXBryZCGWxERGr5AryKWPxd+qzjj+cFpx

2
tools/tcg_rim_tool/src/test/resources/generated_with_cert.swidtag
View File

@ -46,7 +46,7 @@ utuMKyOTf4a6d8TUcbG2RnyzO/6S9bq4cPDYLqWRBM+aGN8e00UWTKpBl6/1EU8wkJA6WdllK2e8
mVkXUPWYyHTZ0qQnrYiuLr36ycAznABDzEAoj4tMZbjIAfuscty6Ggzxl1WbyZLI6YzyXALwaYvr mVkXUPWYyHTZ0qQnrYiuLr36ycAznABDzEAoj4tMZbjIAfuscty6Ggzxl1WbyZLI6YzyXALwaYvr
crTLeyFynlKxuCfDnr1SAHDM65BY</X509Certificate> crTLeyFynlKxuCfDnr1SAHDM65BY</X509Certificate>
</X509Data> </X509Data>
<KeyName>#2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName> <KeyName>2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName>
<KeyValue> <KeyValue>
<RSAKeyValue> <RSAKeyValue>
<Modulus>p3WVYaRJG7EABjbAdqDYZXFSTV1nHY9Ol9A5+W8t5xwBXBryZCGWxERGr5AryKWPxd+qzjj+cFpx <Modulus>p3WVYaRJG7EABjbAdqDYZXFSTV1nHY9Ol9A5+W8t5xwBXBryZCGWxERGr5AryKWPxd+qzjj+cFpx