ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-14 08:49:47 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #549 from nsacyber/issue-529

Browse Source 
[#529] Fix attribute camel case
This commit is contained in:
chubtub 2023-07-18 22:50:35 -04:00 committed by GitHub
commit 15a6c5dbe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagConstants.java
View File

@ -47,7 +47,7 @@ public class SwidTagConstants {
public static final String EDITION = "edition";
public static final String PRODUCT = "product";
public static final String REVISION = "revision";
public static final String PAYLOAD_TYPE = "PayloadType";
public static final String PAYLOAD_TYPE = "payloadType";
public static final String HYBRID = "hybrid";
public static final String PLATFORM_MANUFACTURER_STR = "platformManufacturerStr";
public static final String PLATFORM_MANUFACTURER_ID = "platformManufacturerId";
@ -59,17 +59,17 @@ public class SwidTagConstants {
public static final String FIRMWARE_VERSION = "firmwareVersion";
public static final String BINDING_SPEC = "bindingSpec";
public static final String BINDING_SPEC_VERSION = "bindingSpecVersion";
public static final String PC_URI_LOCAL = "pcURIlocal";
public static final String PC_URI_GLOBAL = "pcURIGlobal";
public static final String PC_URI_LOCAL = "pcUriLocal";
public static final String PC_URI_GLOBAL = "pcUriGlobal";
public static final String RIM_LINK_HASH = "rimLinkHash";
public static final String SIZE = "size";
public static final String HASH = "hash";
public static final String SUPPORT_RIM_TYPE = "supportRIMType";
public static final String SUPPORT_RIM_FORMAT = "supportRIMFormat";
public static final String SUPPORT_RIM_TYPE = "supportRimType";
public static final String SUPPORT_RIM_FORMAT = "supportRimFormat";
public static final String TCG_EVENTLOG_ASSERTION = "TCG_EventLog_Assertion";
public static final String TPM_PCR_ASSERTION = "TPM_PCR_Assertion";
public static final String SUPPORT_RIM_FORMAT_MISSING = "supportRIMFormat missing";
public static final String SUPPORT_RIM_URI_GLOBAL = "supportRIMURIGlobal";
public static final String SUPPORT_RIM_FORMAT_MISSING = "supportRimFormat missing";
public static final String SUPPORT_RIM_URI_GLOBAL = "supportRimUriGlobal";
public static final String DATETIME = "dateTime";
public static final String NIST_NS = "http://csrc.nist.gov/ns/swid/2015-extensions/1.0";

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

@ -101,6 +101,7 @@ public class SwidTagGateway {
private String timestampArgument;
private String directoryOverride;
private String errorRequiredFields;
private String missingNonrequiredFields;
/**
* Default constructor initializes jaxbcontext, marshaller, and unmarshaller
@ -119,6 +120,7 @@ public class SwidTagGateway {
timestampArgument = "";
directoryOverride = "";
errorRequiredFields = "";
missingNonrequiredFields = "";
} catch (JAXBException e) {
System.out.println("Error initializing jaxbcontext: " + e.getMessage());
}
@ -265,6 +267,8 @@ public class SwidTagGateway {
objectFactory.createSoftwareIdentityPayload(payload);
swidTag.getEntityOrEvidenceOrLink().add(jaxbPayload);
//Signature
System.out.println("The following fields were not read in the JSON attributes file: "
+ missingNonrequiredFields.substring(0, missingNonrequiredFields.length() - 2));
if (errorRequiredFields.isEmpty()) {
Document signedSoftwareIdentity = signXMLDocument(
objectFactory.createSoftwareIdentity(swidTag));
@ -381,7 +385,7 @@ public class SwidTagGateway {
if (isTagCreator) {
String regid = jsonObject.getString(SwidTagConstants.REGID, "");
if (regid.isEmpty()) {
//throw exception that regid is required
errorRequiredFields += SwidTagConstants.REGID + ", ";
} else {
entity.setRegid(regid);
}
@ -576,6 +580,8 @@ public class SwidTagGateway {
final QName key, String value) {
if (!value.isEmpty()) {
attributes.put(key, value);
} else {
missingNonrequiredFields += key.getLocalPart() + ", ";
}
}

14
tools/tcg_rim_tool/src/test/resources/generated_default_cert.swidtag
View File

@ -2,7 +2,7 @@
<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:pcRim="https://trustedcomputinggroup.org/resource/tcg-pc-client-reference-integrity-manifest-specification/" corpus="false" name="Example.com BIOS" patch="false" pcRim:id="94f6b457-9ac9-4d35-9b3f-78804173b65as" supplemental="false" tagId="94f6b457-9ac9-4d35-9b3f-78804173b65as" tagVersion="0" version="01" versionScheme="multipartnumeric" xml:lang="en">
<Entity name="Example Inc" regid="http://Example.com" role="softwareCreator tagCreator"/>
<Link href="https://Example.com/support/ProductA/firmware/installfiles" rel="installationmedia"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:PayloadType="direct" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:pcURIGlobal="https://Example.com/support/ProductA/" rim:pcURIlocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:payloadType="direct" rim:pcUriGlobal="https://Example.com/support/ProductA/" rim:pcUriLocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Payload>
<Directory name="rim">
<File xmlns:SHA256="http://www.w3.org/2001/04/xmlenc#sha256" SHA256:hash="4479ca722623f8c47b703996ced3cbd981b06b1ae8a897db70137e0b7c546848" name="Example.com.BIOS.01.rimel" size="7549"/>
@ -17,14 +17,14 @@
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>9pLMfQcXsZKTNXd03a4djOUV6YofZJgtqZssSGf1ZGk=</DigestValue>
<DigestValue>6Zw06t03HhtT/RdeEnhzyMl3L7kl99jh31JLDl5UqXA=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>d1lbsuwLrCC6WMmdRHi2VUn7h6y5dX/sAD+LpRv2wD5IYnIsL+MLgIuiTIblb1xKrbpznMmnpJYG&#13;
jiGwx0PgD10pdaPX2P04/kJbv4MYqfx30TEwNXWKWPxJ1ChOKalqJ0olV/NxA3gX686rzxaoNSQN&#13;
ucwwrKMvZOy+1ZVyX9ewpHXIDRDDdZ8cB7b1SKsY/XQL6+Kel7va608fDn4WvHfpXd3meNePFg7Y&#13;
ORSR5fhElU/YLKkHesIVksfcodKG+I2N4z5yLOFEo8dHWcwKrhtXm2FP1zzLj9qKex9ZVpFJXVsz&#13;
XCgdZu0AhF2T4IJ+NN/3YGHb/JS2p5Z5GrbeFw==</SignatureValue>
<SignatureValue>HgN3Zcp1ayYo447K4MIdSg7zBmG5daVSkwJeXcyvvd1/yCA00ISwzA0HPaJY42JmflpPzMU6oRPZ&#13;
Wk10JhnI8Si6DuQDgs3mNyjQgewdTDv6w02oopl2I8Iw2GpvxYl9WPASmB65nxVvjfTi6ZLwU0Wn&#13;
Mw3nrbTSM2cndg2vmhP7NxRP3vzZtj2d0Uluw7BAaLVPZnrLOCe6fPaIQeg7YXfbk6WyGJGSLmLx&#13;
09EJWU0X7kG8XuPsy02zvHRjvSDjOPVazSZHLLHLRvMR4HCwpXQtmkeo6pId8bihvolECUCtnJzJ&#13;
noL23abi+YKMwuYs4r8KepamYGFJZgU6i5ZQuA==</SignatureValue>
<KeyInfo>
<KeyName>2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName>
</KeyInfo>

14
tools/tcg_rim_tool/src/test/resources/generated_timestamp_rfc3339.swidtag
View File

@ -2,7 +2,7 @@
<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:pcRim="https://trustedcomputinggroup.org/resource/tcg-pc-client-reference-integrity-manifest-specification/" corpus="false" name="Example.com BIOS" patch="false" pcRim:id="94f6b457-9ac9-4d35-9b3f-78804173b65as" supplemental="false" tagId="94f6b457-9ac9-4d35-9b3f-78804173b65as" tagVersion="0" version="01" versionScheme="multipartnumeric" xml:lang="en">
<Entity name="Example Inc" regid="http://Example.com" role="softwareCreator tagCreator"/>
<Link href="https://Example.com/support/ProductA/firmware/installfiles" rel="installationmedia"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:PayloadType="direct" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:pcURIGlobal="https://Example.com/support/ProductA/" rim:pcURIlocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:payloadType="direct" rim:pcUriGlobal="https://Example.com/support/ProductA/" rim:pcUriLocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Payload>
<Directory name="rim">
<File xmlns:SHA256="http://www.w3.org/2001/04/xmlenc#sha256" SHA256:hash="4479ca722623f8c47b703996ced3cbd981b06b1ae8a897db70137e0b7c546848" name="Example.com.BIOS.01.rimel" size="7549"/>
@ -17,18 +17,18 @@
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>9pLMfQcXsZKTNXd03a4djOUV6YofZJgtqZssSGf1ZGk=</DigestValue>
<DigestValue>6Zw06t03HhtT/RdeEnhzyMl3L7kl99jh31JLDl5UqXA=</DigestValue>
</Reference>
<Reference URI="#TST">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>t4Csphwg9wOeclu4aD1noVk7FtRKCDPfUsu6ZP8WNmw=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>Hvx/nVnCcuMPApoaHH+nQWvOtwWRKyAubsoYaNqJVwj2pvyptqo6CePbt0a90ZEZDhkv0nUt56Ky&#13;
VtuHVWK9i7m4JfL/vziZ2AfFkWhWFBD0cc2YxvEGs9pRZCNcYFpkXGXNs/g0ZHJSvFUyo6SgtGvo&#13;
K1i+QJ97HYX0X0BEpXuOKyb5IVsiST3maGwMbdYxWyYWmKqwWALYE6wb+gD/g0gWjsP2EIrTTmOl&#13;
d165CXPGspuCDbfEh51UUqjoqm7cWn/A6L+epFT3bB3G4i3JfSwnLbQvWdNfgukWafAkr5jOUWtG&#13;
3y0ZQd635dDz4cMOWXNWUpB+FRwuV0l/bmRdMQ==</SignatureValue>
<SignatureValue>GiY2+NmHpRncYp3JFSYmx3WSwEFXqCjbcQURgLouKqysh01/R7LVSas6ndzI3us+5Acc+LSMHfHO&#13;
FUme9AcMmXMKGXVX8knLgMeKgA0bDNF+cT3ygGu/UH4xTpaWzEzEpd8REKkQFrteT4eUlxhXdelV&#13;
w4aeav/r/XyUPqQ9f7Of02l/zAnax0XGXVrz7loo1f46awRy1lOy96DjzrfS037LmfDTmxO9DXOZ&#13;
WWvaMQAB5JwMabb0lRVrb94dBV12jdd6+kCKsx+si3y+q9Kl0awpmUpEw2KrVrlVuadFWz0d3Ep5&#13;
PTGOTrh+6ezxBT1BzzbJH0BIUpxdTf+3ysRIkg==</SignatureValue>
<KeyInfo>
<KeyName>2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName>
</KeyInfo>

14
tools/tcg_rim_tool/src/test/resources/generated_timestamp_rfc3852.swidtag
View File

@ -2,7 +2,7 @@
<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:pcRim="https://trustedcomputinggroup.org/resource/tcg-pc-client-reference-integrity-manifest-specification/" corpus="false" name="Example.com BIOS" patch="false" pcRim:id="94f6b457-9ac9-4d35-9b3f-78804173b65as" supplemental="false" tagId="94f6b457-9ac9-4d35-9b3f-78804173b65as" tagVersion="0" version="01" versionScheme="multipartnumeric" xml:lang="en">
<Entity name="Example Inc" regid="http://Example.com" role="softwareCreator tagCreator"/>
<Link href="https://Example.com/support/ProductA/firmware/installfiles" rel="installationmedia"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:PayloadType="direct" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:pcURIGlobal="https://Example.com/support/ProductA/" rim:pcURIlocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:payloadType="direct" rim:pcUriGlobal="https://Example.com/support/ProductA/" rim:pcUriLocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Payload>
<Directory name="rim">
<File xmlns:SHA256="http://www.w3.org/2001/04/xmlenc#sha256" SHA256:hash="4479ca722623f8c47b703996ced3cbd981b06b1ae8a897db70137e0b7c546848" name="Example.com.BIOS.01.rimel" size="7549"/>
@ -17,18 +17,18 @@
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>9pLMfQcXsZKTNXd03a4djOUV6YofZJgtqZssSGf1ZGk=</DigestValue>
<DigestValue>6Zw06t03HhtT/RdeEnhzyMl3L7kl99jh31JLDl5UqXA=</DigestValue>
</Reference>
<Reference URI="#TST">
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>Sv8QDWUUwrxCoUwFj0veh3oFqG/8XVscoqUDd96GL6Q=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>bCet0/jmRLoKnSicKKjkIQCox0gxZv48mOe0PcPU3FRBHbyZc4zzGeeanisz4/HwR4VbE1yKp1M4&#13;
O2swiUih6iqNQwirQJVMks69fx9ueonPTUfJnQ/I+XLzCWRWivMM4gPs6Ubuvim+81I4Hjv2uIE2&#13;
bqAWcixIvXvSaUL+O3BnTy9ykgRQrG9easHjEFV/Jrfb0s33WtvmjuV0kqDgHtvG96RitYOLG0Tr&#13;
naEe2zNgB8+44IyWwGzEkYjG7JIVOW9QqlSKn4Gc2SVATw8eFnIRQYDh3kLG+IcaX8b94BabTiaX&#13;
OH3ezftPeYay9H3f3nuApQZ5ujmqoORcTJxXcA==</SignatureValue>
<SignatureValue>MIf7oNlVWjC47hDo82Zbk2+KSVgtBwHi285eQ336iIZuj16R2CoPtVmvYp1lCmTVd5/9IKWphE9q&#13;
Yc4Pe8zF73lMTMVDCc9KgEiGrl/3bDjGk7VzDrj/LdfwRJtD+PDnjUwsiTBNRVMJDdF/bZhvNF9d&#13;
CCzzPemTt0Zz33PAC9qf0cEyNLSXyV5Uqy8FyRb5K4UZyyW1QBgKiiyoYJ2vU+Zae2x6nbDJAT3b&#13;
NDfFs7c/Eit4ov5nMDbfjgm+eir3aWpXSTlm+N+rkT5n603WbVESeyUdVWffXuhQm9ouLi1DMIiN&#13;
8nh2qfwHZvV1EhdlEgaNOiG3tFC7HTMURC23WA==</SignatureValue>
<KeyInfo>
<KeyName>2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName>
</KeyInfo>

14
tools/tcg_rim_tool/src/test/resources/generated_truststore_embed.swidtag
View File

@ -2,7 +2,7 @@
<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:pcRim="https://trustedcomputinggroup.org/resource/tcg-pc-client-reference-integrity-manifest-specification/" corpus="false" name="Example.com BIOS" patch="false" pcRim:id="94f6b457-9ac9-4d35-9b3f-78804173b65as" supplemental="false" tagId="94f6b457-9ac9-4d35-9b3f-78804173b65as" tagVersion="0" version="01" versionScheme="multipartnumeric" xml:lang="en">
<Entity name="Example Inc" regid="http://Example.com" role="softwareCreator tagCreator"/>
<Link href="https://Example.com/support/ProductA/firmware/installfiles" rel="installationmedia"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:PayloadType="direct" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:pcURIGlobal="https://Example.com/support/ProductA/" rim:pcURIlocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:payloadType="direct" rim:pcUriGlobal="https://Example.com/support/ProductA/" rim:pcUriLocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Payload>
<Directory name="rim">
<File xmlns:SHA256="http://www.w3.org/2001/04/xmlenc#sha256" SHA256:hash="4479ca722623f8c47b703996ced3cbd981b06b1ae8a897db70137e0b7c546848" name="Example.com.BIOS.01.rimel" size="7549"/>
@ -17,14 +17,14 @@
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>9pLMfQcXsZKTNXd03a4djOUV6YofZJgtqZssSGf1ZGk=</DigestValue>
<DigestValue>6Zw06t03HhtT/RdeEnhzyMl3L7kl99jh31JLDl5UqXA=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>d1lbsuwLrCC6WMmdRHi2VUn7h6y5dX/sAD+LpRv2wD5IYnIsL+MLgIuiTIblb1xKrbpznMmnpJYG&#13;
jiGwx0PgD10pdaPX2P04/kJbv4MYqfx30TEwNXWKWPxJ1ChOKalqJ0olV/NxA3gX686rzxaoNSQN&#13;
ucwwrKMvZOy+1ZVyX9ewpHXIDRDDdZ8cB7b1SKsY/XQL6+Kel7va608fDn4WvHfpXd3meNePFg7Y&#13;
ORSR5fhElU/YLKkHesIVksfcodKG+I2N4z5yLOFEo8dHWcwKrhtXm2FP1zzLj9qKex9ZVpFJXVsz&#13;
XCgdZu0AhF2T4IJ+NN/3YGHb/JS2p5Z5GrbeFw==</SignatureValue>
<SignatureValue>HgN3Zcp1ayYo447K4MIdSg7zBmG5daVSkwJeXcyvvd1/yCA00ISwzA0HPaJY42JmflpPzMU6oRPZ&#13;
Wk10JhnI8Si6DuQDgs3mNyjQgewdTDv6w02oopl2I8Iw2GpvxYl9WPASmB65nxVvjfTi6ZLwU0Wn&#13;
Mw3nrbTSM2cndg2vmhP7NxRP3vzZtj2d0Uluw7BAaLVPZnrLOCe6fPaIQeg7YXfbk6WyGJGSLmLx&#13;
09EJWU0X7kG8XuPsy02zvHRjvSDjOPVazSZHLLHLRvMR4HCwpXQtmkeo6pId8bihvolECUCtnJzJ&#13;
noL23abi+YKMwuYs4r8KepamYGFJZgU6i5ZQuA==</SignatureValue>
<KeyInfo>
<X509Data>
<X509SubjectName>CN=example.RIM.signer,OU=PCClient,O=Example,ST=VA,C=US</X509SubjectName>

14
tools/tcg_rim_tool/src/test/resources/generated_user_cert.swidtag
View File

@ -2,7 +2,7 @@
<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:pcRim="https://trustedcomputinggroup.org/resource/tcg-pc-client-reference-integrity-manifest-specification/" corpus="false" name="Example.com BIOS" patch="false" pcRim:id="94f6b457-9ac9-4d35-9b3f-78804173b65as" supplemental="false" tagId="94f6b457-9ac9-4d35-9b3f-78804173b65as" tagVersion="0" version="01" versionScheme="multipartnumeric" xml:lang="en">
<Entity name="Example Inc" regid="http://Example.com" role="softwareCreator tagCreator"/>
<Link href="https://Example.com/support/ProductA/firmware/installfiles" rel="installationmedia"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:PayloadType="direct" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:pcURIGlobal="https://Example.com/support/ProductA/" rim:pcURIlocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:payloadType="direct" rim:pcUriGlobal="https://Example.com/support/ProductA/" rim:pcUriLocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Payload>
<Directory name="rim">
<File xmlns:SHA256="http://www.w3.org/2001/04/xmlenc#sha256" SHA256:hash="4479ca722623f8c47b703996ced3cbd981b06b1ae8a897db70137e0b7c546848" name="Example.com.BIOS.01.rimel" size="7549"/>
@ -17,14 +17,14 @@
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>9pLMfQcXsZKTNXd03a4djOUV6YofZJgtqZssSGf1ZGk=</DigestValue>
<DigestValue>6Zw06t03HhtT/RdeEnhzyMl3L7kl99jh31JLDl5UqXA=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>d1lbsuwLrCC6WMmdRHi2VUn7h6y5dX/sAD+LpRv2wD5IYnIsL+MLgIuiTIblb1xKrbpznMmnpJYG&#13;
jiGwx0PgD10pdaPX2P04/kJbv4MYqfx30TEwNXWKWPxJ1ChOKalqJ0olV/NxA3gX686rzxaoNSQN&#13;
ucwwrKMvZOy+1ZVyX9ewpHXIDRDDdZ8cB7b1SKsY/XQL6+Kel7va608fDn4WvHfpXd3meNePFg7Y&#13;
ORSR5fhElU/YLKkHesIVksfcodKG+I2N4z5yLOFEo8dHWcwKrhtXm2FP1zzLj9qKex9ZVpFJXVsz&#13;
XCgdZu0AhF2T4IJ+NN/3YGHb/JS2p5Z5GrbeFw==</SignatureValue>
<SignatureValue>HgN3Zcp1ayYo447K4MIdSg7zBmG5daVSkwJeXcyvvd1/yCA00ISwzA0HPaJY42JmflpPzMU6oRPZ&#13;
Wk10JhnI8Si6DuQDgs3mNyjQgewdTDv6w02oopl2I8Iw2GpvxYl9WPASmB65nxVvjfTi6ZLwU0Wn&#13;
Mw3nrbTSM2cndg2vmhP7NxRP3vzZtj2d0Uluw7BAaLVPZnrLOCe6fPaIQeg7YXfbk6WyGJGSLmLx&#13;
09EJWU0X7kG8XuPsy02zvHRjvSDjOPVazSZHLLHLRvMR4HCwpXQtmkeo6pId8bihvolECUCtnJzJ&#13;
noL23abi+YKMwuYs4r8KepamYGFJZgU6i5ZQuA==</SignatureValue>
<KeyInfo>
<KeyName>2fdeb8e7d030a2209daa01861a964fedecf2bcc1</KeyName>
<KeyValue>

14
tools/tcg_rim_tool/src/test/resources/generated_user_cert_embed.swidtag
View File

@ -2,7 +2,7 @@
<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:pcRim="https://trustedcomputinggroup.org/resource/tcg-pc-client-reference-integrity-manifest-specification/" corpus="false" name="Example.com BIOS" patch="false" pcRim:id="94f6b457-9ac9-4d35-9b3f-78804173b65as" supplemental="false" tagId="94f6b457-9ac9-4d35-9b3f-78804173b65as" tagVersion="0" version="01" versionScheme="multipartnumeric" xml:lang="en">
<Entity name="Example Inc" regid="http://Example.com" role="softwareCreator tagCreator"/>
<Link href="https://Example.com/support/ProductA/firmware/installfiles" rel="installationmedia"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:PayloadType="direct" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:pcURIGlobal="https://Example.com/support/ProductA/" rim:pcURIlocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Meta xmlns:n8060="http://csrc.nist.gov/ns/swid/2015-extensions/1.0" xmlns:rim="https://trustedcomputinggroup.org/wp-content/uploads/TCG_RIM_Model" n8060:colloquialVersion="Firmware_2019" n8060:edition="12" n8060:product="ProductA" n8060:revision="r2" rim:bindingSpec="PC Client RIM" rim:bindingSpecVersion="1.2" rim:firmwareManufacturerId="00213022" rim:firmwareManufacturerStr="BIOSVendorA" rim:firmwareModel="A0" rim:firmwareVersion="12" rim:payloadType="direct" rim:pcUriGlobal="https://Example.com/support/ProductA/" rim:pcUriLocal="/boot/tcg/manifest/switag/" rim:platformManufacturerId="00201234" rim:platformManufacturerStr="Example.com" rim:platformModel="ProductA" rim:platformVersion="01"/>
<Payload>
<Directory name="rim">
<File xmlns:SHA256="http://www.w3.org/2001/04/xmlenc#sha256" SHA256:hash="4479ca722623f8c47b703996ced3cbd981b06b1ae8a897db70137e0b7c546848" name="Example.com.BIOS.01.rimel" size="7549"/>
@ -17,14 +17,14 @@
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
</Transforms>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<DigestValue>9pLMfQcXsZKTNXd03a4djOUV6YofZJgtqZssSGf1ZGk=</DigestValue>
<DigestValue>6Zw06t03HhtT/RdeEnhzyMl3L7kl99jh31JLDl5UqXA=</DigestValue>
</Reference>
</SignedInfo>
<SignatureValue>d1lbsuwLrCC6WMmdRHi2VUn7h6y5dX/sAD+LpRv2wD5IYnIsL+MLgIuiTIblb1xKrbpznMmnpJYG&#13;
jiGwx0PgD10pdaPX2P04/kJbv4MYqfx30TEwNXWKWPxJ1ChOKalqJ0olV/NxA3gX686rzxaoNSQN&#13;
ucwwrKMvZOy+1ZVyX9ewpHXIDRDDdZ8cB7b1SKsY/XQL6+Kel7va608fDn4WvHfpXd3meNePFg7Y&#13;
ORSR5fhElU/YLKkHesIVksfcodKG+I2N4z5yLOFEo8dHWcwKrhtXm2FP1zzLj9qKex9ZVpFJXVsz&#13;
XCgdZu0AhF2T4IJ+NN/3YGHb/JS2p5Z5GrbeFw==</SignatureValue>
<SignatureValue>HgN3Zcp1ayYo447K4MIdSg7zBmG5daVSkwJeXcyvvd1/yCA00ISwzA0HPaJY42JmflpPzMU6oRPZ&#13;
Wk10JhnI8Si6DuQDgs3mNyjQgewdTDv6w02oopl2I8Iw2GpvxYl9WPASmB65nxVvjfTi6ZLwU0Wn&#13;
Mw3nrbTSM2cndg2vmhP7NxRP3vzZtj2d0Uluw7BAaLVPZnrLOCe6fPaIQeg7YXfbk6WyGJGSLmLx&#13;
09EJWU0X7kG8XuPsy02zvHRjvSDjOPVazSZHLLHLRvMR4HCwpXQtmkeo6pId8bihvolECUCtnJzJ&#13;
noL23abi+YKMwuYs4r8KepamYGFJZgU6i5ZQuA==</SignatureValue>
<KeyInfo>
<X509Data>
<X509SubjectName>CN=example.RIM.signer,OU=PCClient,O=Example,ST=VA,C=US</X509SubjectName>

10
tools/tcg_rim_tool/src/test/resources/rim_fields.json
View File

@ -21,7 +21,7 @@
"edition": "12",
"product": "ProductA",
"revision": "r2",
"PayloadType": "direct",
"payloadType": "direct",
"platformManufacturerStr": "Example.com",
"platformManufacturerId": "00201234",
"platformModel": "ProductA",
@ -32,12 +32,12 @@
"firmwareVersion": "12",
"bindingSpec": "PC Client RIM",
"bindingSpecVersion": "1.2",
"pcURIlocal": "/boot/tcg/manifest/switag/",
"pcURIGlobal": "https://Example.com/support/ProductA/"
"pcUriLocal": "/boot/tcg/manifest/switag/",
"pcUriGlobal": "https://Example.com/support/ProductA/"
},
"Payload": {
"supportRIMURIGlobal": "https://Example.com/support/ProductA/firmware/rims/",
"supportRIMFormat":"TCG_EventLog_Assertion",
"supportRimUriGlobal": "https://Example.com/support/ProductA/firmware/rims/",
"supportRimFormat":"TCG_EventLog_Assertion",
"Directory": {
"name": "rim",
"root": "/boot/tcg/manifest/rim/",