diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java index 59165131..78afbeaf 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java @@ -10,6 +10,7 @@ import hirs.attestationca.portal.page.PageController; import hirs.attestationca.portal.page.PageMessages; import hirs.attestationca.portal.page.params.NoPageParams; import hirs.data.persist.BaseReferenceManifest; +import hirs.data.persist.EventLogMeasurements; import hirs.data.persist.ReferenceDigestValue; import hirs.data.persist.ReferenceManifest; import hirs.data.persist.SupportReferenceManifest; @@ -471,6 +472,11 @@ public class ReferenceManifestPageController .byEntityId(uuid).getRIM(); } + if (rim == null) { + rim = EventLogMeasurements.select(referenceManifestManager) + .byEntityId(uuid).getRIM(); + } + return rim; } diff --git a/NOTICE b/NOTICE index f701f249..fd8960a7 100644 --- a/NOTICE +++ b/NOTICE @@ -12,7 +12,8 @@ jandex, javassist, jboss-logging, joda-time, log4j2, Embedded tomcat, xml_rpc_client, taglibs, gson, guava, Json-simple, HikariCP, Jackson-core, Jadira Framework, Jcommander, powermock, Selenium, Spring, snmp4j, Testng, usertype, validation-api, ws-commons-util, xml-apis, rendersnake, log4cplus, -and spring-data-jpa-datatables. +spring-data-jpa-datatables, xunit, serilog, Serilog.Settings.Configuration, +Serilog.Sinks.Console, and Serilog.Sinks.File. Apache License Version 2.0, January 2004 @@ -2266,4 +2267,93 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. + +CommandLineParser is copyrighted under MIT License + +Copyright (c) 2005 - 2015 Giacomo Stelluti Scala & Contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +dotnet is copyrighted under MIT License + +Copyright (c) .NET Foundation and Contributors + +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +TSS.MSR is copyrighted under MIT License + +Copyright (c) Microsoft Corporation. All rights reserved. + +The MIT License (MIT) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Newtonsoft.Json is copyrighted under MIT License + +The MIT License (MIT) + +Copyright (c) 2007 James Newton-King + +Permission is hereby granted, free of charge, to any person obtaining a copy of this +software and associated documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons +to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or +substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/tools/tcg_rim_tool/rim_fields.json b/tools/tcg_rim_tool/rim_fields.json index faeff38d..192bc897 100644 --- a/tools/tcg_rim_tool/rim_fields.json +++ b/tools/tcg_rim_tool/rim_fields.json @@ -30,6 +30,7 @@ }, "Payload": { "Directory": { + "supportRIMFormat": "TCG_EventLog_Assertion", "name": "iotBase", "File": { "name": "TpmLog.bin" diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagConstants.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagConstants.java index 0342ca9c..c5dd2af1 100644 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagConstants.java +++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagConstants.java @@ -67,6 +67,9 @@ public class SwidTagConstants { 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 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 QName _SHA256_HASH = new QName( diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java index bbf1edac..55ca8416 100644 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java +++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java @@ -162,7 +162,8 @@ public class SwidTagGateway { JsonObject configProperties = reader.readObject(); reader.close(); //SoftwareIdentity - swidTag = createSwidTag(configProperties.getJsonObject(SwidTagConstants.SOFTWARE_IDENTITY)); + swidTag = createSwidTag( + configProperties.getJsonObject(SwidTagConstants.SOFTWARE_IDENTITY)); //Entity JAXBElement entity = objectFactory.createSoftwareIdentityEntity( createEntity(configProperties.getJsonObject(SwidTagConstants.ENTITY))); @@ -199,7 +200,8 @@ public class SwidTagGateway { System.out.println(e.getMessage()); } - Document signedSoftwareIdentity = signXMLDocument(objectFactory.createSoftwareIdentity(swidTag)); + Document signedSoftwareIdentity = signXMLDocument( + objectFactory.createSoftwareIdentity(swidTag)); writeSwidTagFile(signedSoftwareIdentity, filename); } @@ -247,14 +249,16 @@ public class SwidTagGateway { if (!tagId.isEmpty()) { swidTag.setTagId(tagId); } - swidTag.setTagVersion(new BigInteger(jsonObject.getString(SwidTagConstants.TAGVERSION, "0"))); + swidTag.setTagVersion(new BigInteger( + jsonObject.getString(SwidTagConstants.TAGVERSION, "0"))); swidTag.setVersion(jsonObject.getString(SwidTagConstants.VERSION, "0.0")); swidTag.setCorpus(jsonObject.getBoolean(SwidTagConstants.CORPUS, false)); swidTag.setPatch(jsonObject.getBoolean(SwidTagConstants.PATCH, false)); swidTag.setSupplemental(jsonObject.getBoolean(SwidTagConstants.SUPPLEMENTAL, false)); if (!swidTag.isCorpus() && !swidTag.isPatch() && !swidTag.isSupplemental() && swidTag.getVersion() != "0.0") { - swidTag.setVersionScheme(jsonObject.getString(SwidTagConstants.VERSION_SCHEME, "multipartnumeric")); + swidTag.setVersionScheme( + jsonObject.getString(SwidTagConstants.VERSION_SCHEME, "multipartnumeric")); } return swidTag; @@ -329,24 +333,42 @@ public class SwidTagGateway { private SoftwareMeta createSoftwareMeta(JsonObject jsonObject) { SoftwareMeta softwareMeta = objectFactory.createSoftwareMeta(); Map attributes = softwareMeta.getOtherAttributes(); - addNonNullAttribute(attributes, SwidTagConstants._COLLOQUIAL_VERSION, jsonObject.getString(SwidTagConstants.COLLOQUIAL_VERSION, "")); - addNonNullAttribute(attributes, SwidTagConstants._EDITION, jsonObject.getString(SwidTagConstants.EDITION, "")); - addNonNullAttribute(attributes, SwidTagConstants._PRODUCT, jsonObject.getString(SwidTagConstants.PRODUCT, "")); - addNonNullAttribute(attributes, SwidTagConstants._REVISION, jsonObject.getString(SwidTagConstants.REVISION, "")); - addNonNullAttribute(attributes, SwidTagConstants._PAYLOAD_TYPE, jsonObject.getString(SwidTagConstants.PAYLOAD_TYPE, "")); - addNonNullAttribute(attributes, SwidTagConstants._PLATFORM_MANUFACTURER_STR, jsonObject.getString(SwidTagConstants.PLATFORM_MANUFACTURER_STR, "")); - addNonNullAttribute(attributes, SwidTagConstants._PLATFORM_MANUFACTURER_ID, jsonObject.getString(SwidTagConstants.PLATFORM_MANUFACTURER_ID, "")); - addNonNullAttribute(attributes, SwidTagConstants._PLATFORM_MODEL, jsonObject.getString(SwidTagConstants.PLATFORM_MODEL, "")); - addNonNullAttribute(attributes, SwidTagConstants._PLATFORM_VERSION, jsonObject.getString(SwidTagConstants.PLATFORM_VERSION, "")); - addNonNullAttribute(attributes, SwidTagConstants._FIRMWARE_MANUFACTURER_STR, jsonObject.getString(SwidTagConstants.FIRMWARE_MANUFACTURER_STR, "")); - addNonNullAttribute(attributes, SwidTagConstants._FIRMWARE_MANUFACTURER_ID, jsonObject.getString(SwidTagConstants.FIRMWARE_MANUFACTURER_ID, "")); - addNonNullAttribute(attributes, SwidTagConstants._FIRMWARE_MODEL, jsonObject.getString(SwidTagConstants.FIRMWARE_MODEL, "")); - addNonNullAttribute(attributes, SwidTagConstants._FIRMWARE_VERSION, jsonObject.getString(SwidTagConstants.FIRMWARE_VERSION, "")); - addNonNullAttribute(attributes, SwidTagConstants._BINDING_SPEC, jsonObject.getString(SwidTagConstants.BINDING_SPEC, "")); - addNonNullAttribute(attributes, SwidTagConstants._BINDING_SPEC_VERSION, jsonObject.getString(SwidTagConstants.BINDING_SPEC_VERSION, "")); - addNonNullAttribute(attributes, SwidTagConstants._PC_URI_LOCAL, jsonObject.getString(SwidTagConstants.PC_URI_LOCAL, "")); - addNonNullAttribute(attributes, SwidTagConstants._PC_URI_GLOBAL, jsonObject.getString(SwidTagConstants.PC_URI_GLOBAL, "")); - addNonNullAttribute(attributes, SwidTagConstants._RIM_LINK_HASH, jsonObject.getString(SwidTagConstants.RIM_LINK_HASH, "")); + addNonNullAttribute(attributes, SwidTagConstants._COLLOQUIAL_VERSION, + jsonObject.getString(SwidTagConstants.COLLOQUIAL_VERSION, "")); + addNonNullAttribute(attributes, SwidTagConstants._EDITION, + jsonObject.getString(SwidTagConstants.EDITION, "")); + addNonNullAttribute(attributes, SwidTagConstants._PRODUCT, + jsonObject.getString(SwidTagConstants.PRODUCT, "")); + addNonNullAttribute(attributes, SwidTagConstants._REVISION, + jsonObject.getString(SwidTagConstants.REVISION, "")); + addNonNullAttribute(attributes, SwidTagConstants._PAYLOAD_TYPE, + jsonObject.getString(SwidTagConstants.PAYLOAD_TYPE, "")); + addNonNullAttribute(attributes, SwidTagConstants._PLATFORM_MANUFACTURER_STR, + jsonObject.getString(SwidTagConstants.PLATFORM_MANUFACTURER_STR, "")); + addNonNullAttribute(attributes, SwidTagConstants._PLATFORM_MANUFACTURER_ID, + jsonObject.getString(SwidTagConstants.PLATFORM_MANUFACTURER_ID, "")); + addNonNullAttribute(attributes, SwidTagConstants._PLATFORM_MODEL, + jsonObject.getString(SwidTagConstants.PLATFORM_MODEL, "")); + addNonNullAttribute(attributes, SwidTagConstants._PLATFORM_VERSION, + jsonObject.getString(SwidTagConstants.PLATFORM_VERSION, "")); + addNonNullAttribute(attributes, SwidTagConstants._FIRMWARE_MANUFACTURER_STR, + jsonObject.getString(SwidTagConstants.FIRMWARE_MANUFACTURER_STR, "")); + addNonNullAttribute(attributes, SwidTagConstants._FIRMWARE_MANUFACTURER_ID, + jsonObject.getString(SwidTagConstants.FIRMWARE_MANUFACTURER_ID, "")); + addNonNullAttribute(attributes, SwidTagConstants._FIRMWARE_MODEL, + jsonObject.getString(SwidTagConstants.FIRMWARE_MODEL, "")); + addNonNullAttribute(attributes, SwidTagConstants._FIRMWARE_VERSION, + jsonObject.getString(SwidTagConstants.FIRMWARE_VERSION, "")); + addNonNullAttribute(attributes, SwidTagConstants._BINDING_SPEC, + jsonObject.getString(SwidTagConstants.BINDING_SPEC, "")); + addNonNullAttribute(attributes, SwidTagConstants._BINDING_SPEC_VERSION, + jsonObject.getString(SwidTagConstants.BINDING_SPEC_VERSION, "")); + addNonNullAttribute(attributes, SwidTagConstants._PC_URI_LOCAL, + jsonObject.getString(SwidTagConstants.PC_URI_LOCAL, "")); + addNonNullAttribute(attributes, SwidTagConstants._PC_URI_GLOBAL, + jsonObject.getString(SwidTagConstants.PC_URI_GLOBAL, "")); + addNonNullAttribute(attributes, SwidTagConstants._RIM_LINK_HASH, + jsonObject.getString(SwidTagConstants.RIM_LINK_HASH, "")); return softwareMeta; } @@ -360,12 +382,12 @@ public class SwidTagGateway { private ResourceCollection createPayload(JsonObject jsonObject) { ResourceCollection payload = objectFactory.createResourceCollection(); Map attributes = payload.getOtherAttributes(); - addNonNullAttribute(attributes, SwidTagConstants._N8060_ENVVARPREFIX, jsonObject.getString(SwidTagConstants._N8060_ENVVARPREFIX.getLocalPart(), "")); - addNonNullAttribute(attributes, SwidTagConstants._N8060_ENVVARSUFFIX, jsonObject.getString(SwidTagConstants._N8060_ENVVARSUFFIX.getLocalPart(), "")); - addNonNullAttribute(attributes, SwidTagConstants._N8060_PATHSEPARATOR, jsonObject.getString(SwidTagConstants._N8060_PATHSEPARATOR.getLocalPart(), "")); - addNonNullAttribute(attributes, SwidTagConstants._SUPPORT_RIM_FORMAT, jsonObject.getString(SwidTagConstants.SUPPORT_RIM_FORMAT, "")); - addNonNullAttribute(attributes, SwidTagConstants._SUPPORT_RIM_TYPE, jsonObject.getString(SwidTagConstants.SUPPORT_RIM_TYPE, "")); - addNonNullAttribute(attributes, SwidTagConstants._SUPPORT_RIM_URI_GLOBAL, jsonObject.getString(SwidTagConstants.SUPPORT_RIM_URI_GLOBAL, "")); + addNonNullAttribute(attributes, SwidTagConstants._N8060_ENVVARPREFIX, + jsonObject.getString(SwidTagConstants._N8060_ENVVARPREFIX.getLocalPart(), "")); + addNonNullAttribute(attributes, SwidTagConstants._N8060_ENVVARSUFFIX, + jsonObject.getString(SwidTagConstants._N8060_ENVVARSUFFIX.getLocalPart(), "")); + addNonNullAttribute(attributes, SwidTagConstants._N8060_PATHSEPARATOR, + jsonObject.getString(SwidTagConstants._N8060_PATHSEPARATOR.getLocalPart(), "")); return payload; } @@ -379,6 +401,21 @@ public class SwidTagGateway { private Directory createDirectory(JsonObject jsonObject) { Directory directory = objectFactory.createDirectory(); directory.setName(jsonObject.getString(SwidTagConstants.NAME, "")); + Map attributes = directory.getOtherAttributes(); + String supportRimFormat = jsonObject.getString(SwidTagConstants.SUPPORT_RIM_FORMAT, + SwidTagConstants.SUPPORT_RIM_FORMAT_MISSING); + if (!supportRimFormat.equals(SwidTagConstants.SUPPORT_RIM_FORMAT_MISSING)) { + if (supportRimFormat.isEmpty()) { + attributes.put(SwidTagConstants._SUPPORT_RIM_FORMAT, + SwidTagConstants.TCG_EVENTLOG_ASSERTION); + } else { + attributes.put(SwidTagConstants._SUPPORT_RIM_FORMAT, supportRimFormat); + } + } + addNonNullAttribute(attributes, SwidTagConstants._SUPPORT_RIM_TYPE, + jsonObject.getString(SwidTagConstants.SUPPORT_RIM_TYPE, "")); + addNonNullAttribute(attributes, SwidTagConstants._SUPPORT_RIM_URI_GLOBAL, + jsonObject.getString(SwidTagConstants.SUPPORT_RIM_URI_GLOBAL, "")); return directory; } @@ -394,9 +431,23 @@ public class SwidTagGateway { private hirs.swid.xjc.File createFile(JsonObject jsonObject) { hirs.swid.xjc.File file = objectFactory.createFile(); file.setName(jsonObject.getString(SwidTagConstants.NAME, "")); + Map attributes = file.getOtherAttributes(); + String supportRimFormat = jsonObject.getString(SwidTagConstants.SUPPORT_RIM_FORMAT, + SwidTagConstants.SUPPORT_RIM_FORMAT_MISSING); + if (!supportRimFormat.equals(SwidTagConstants.SUPPORT_RIM_FORMAT_MISSING)) { + if (supportRimFormat.isEmpty()) { + attributes.put(SwidTagConstants._SUPPORT_RIM_FORMAT, + SwidTagConstants.TCG_EVENTLOG_ASSERTION); + } else { + attributes.put(SwidTagConstants._SUPPORT_RIM_FORMAT, supportRimFormat); + } + } + addNonNullAttribute(attributes, SwidTagConstants._SUPPORT_RIM_TYPE, + jsonObject.getString(SwidTagConstants.SUPPORT_RIM_TYPE, "")); + addNonNullAttribute(attributes, SwidTagConstants._SUPPORT_RIM_URI_GLOBAL, + jsonObject.getString(SwidTagConstants.SUPPORT_RIM_URI_GLOBAL, "")); File rimEventLogFile = new File(rimEventLog); file.setSize(new BigInteger(Long.toString(rimEventLogFile.length()))); - Map attributes = file.getOtherAttributes(); addNonNullAttribute(attributes, SwidTagConstants._SHA256_HASH, HashSwid.get256Hash(rimEventLog)); return file; diff --git a/tools/tcg_rim_tool/src/test/resources/generated_no_cert.swidtag b/tools/tcg_rim_tool/src/test/resources/generated_no_cert.swidtag index ea454392..29193469 100644 --- a/tools/tcg_rim_tool/src/test/resources/generated_no_cert.swidtag +++ b/tools/tcg_rim_tool/src/test/resources/generated_no_cert.swidtag @@ -3,7 +3,7 @@ - + @@ -17,14 +17,14 @@ - 97uWB7zSsO5WaGbrcQrlKd1Bju0aDTjK1/ktUYBje8A= + K3XoBeYvgJBAKl8z273sL7z38qLLVBKLfUPt/gPUzBI= - N1YtTeo2Ryuj+CtlXIpICEay+ni7vt8+4J7tAsYpa3efnLwtea69PIqEylPWm9LdA8Eo8XDdpgxV -7h3hi2LTOU+Wxq3bLiLamo99T1EtIwl+ZPcOv8bsfEkmShHdMC0dlfcj6r7x4tc0XkNAhhJgfRNz -FsmPWKJb6FYcsHFbHO/Uw1hSokbAGcWWTshEOqvKHMa8UVkrFMUPnrnMtdyJqZlhDBrZHNi4rWth -8TjlUnQVSCF9s9I04FxJ1cUAdeVMHtXKM8Pvjv68PaJMJK73dW5Yd3SbcgoKLesf/HPWeeZL0rr4 -TNjlqJ/wq61Ons45MFG9bIscVbnd+XxFHx8Skw== + cIl1gPsUyEj2gDv3HTWNFDVxtcBjz4Revxxf2LJejtOXQW8mGepZH8CnvgO7zCAbZYlYUZXjYZ9M +jONVv8dcsAjVHRnP6YHywFfmSm8LUCwxsfuZQqn5jClqzu5VaqLzBhuJYvCpiEdIDJwDINQuORUB +nzul1CWc3Sm1Ms2wjlIq5ctWWJcddhdyIOjl8/oD4EC5E2rOSfNcRMZxldXtie9iinFGVbr0YNE+ ++lQ7hAU+SyV8RMx9tGnnsO8otwV4ddF+OfemcbzWGYBenLs3A8ZqWZyTvWphCgGqDUbOLssYciCC +mnYm5QOeh4QcE9H2kqTgZvcyCgPL/hDC7xhyjQ== 2fdeb8e7d030a2209daa01861a964fedecf2bcc1 diff --git a/tools/tcg_rim_tool/src/test/resources/generated_with_cert.swidtag b/tools/tcg_rim_tool/src/test/resources/generated_with_cert.swidtag index dc711f3e..f47230cf 100644 --- a/tools/tcg_rim_tool/src/test/resources/generated_with_cert.swidtag +++ b/tools/tcg_rim_tool/src/test/resources/generated_with_cert.swidtag @@ -3,7 +3,7 @@ - + @@ -17,14 +17,14 @@ - 97uWB7zSsO5WaGbrcQrlKd1Bju0aDTjK1/ktUYBje8A= + K3XoBeYvgJBAKl8z273sL7z38qLLVBKLfUPt/gPUzBI= - N1YtTeo2Ryuj+CtlXIpICEay+ni7vt8+4J7tAsYpa3efnLwtea69PIqEylPWm9LdA8Eo8XDdpgxV -7h3hi2LTOU+Wxq3bLiLamo99T1EtIwl+ZPcOv8bsfEkmShHdMC0dlfcj6r7x4tc0XkNAhhJgfRNz -FsmPWKJb6FYcsHFbHO/Uw1hSokbAGcWWTshEOqvKHMa8UVkrFMUPnrnMtdyJqZlhDBrZHNi4rWth -8TjlUnQVSCF9s9I04FxJ1cUAdeVMHtXKM8Pvjv68PaJMJK73dW5Yd3SbcgoKLesf/HPWeeZL0rr4 -TNjlqJ/wq61Ons45MFG9bIscVbnd+XxFHx8Skw== + cIl1gPsUyEj2gDv3HTWNFDVxtcBjz4Revxxf2LJejtOXQW8mGepZH8CnvgO7zCAbZYlYUZXjYZ9M +jONVv8dcsAjVHRnP6YHywFfmSm8LUCwxsfuZQqn5jClqzu5VaqLzBhuJYvCpiEdIDJwDINQuORUB +nzul1CWc3Sm1Ms2wjlIq5ctWWJcddhdyIOjl8/oD4EC5E2rOSfNcRMZxldXtie9iinFGVbr0YNE+ ++lQ7hAU+SyV8RMx9tGnnsO8otwV4ddF+OfemcbzWGYBenLs3A8ZqWZyTvWphCgGqDUbOLssYciCC +mnYm5QOeh4QcE9H2kqTgZvcyCgPL/hDC7xhyjQ== CN=example.RIM.signer,OU=PCClient,O=Example,ST=VA,C=US