From 70533b5c8fff3e9eb9e3b7bc6dd439d53036915a Mon Sep 17 00:00:00 2001 From: ChrisC Date: Fri, 12 Feb 2021 16:21:40 +0100 Subject: Fix build Fix catalog-be tests and Integration docker test this fix is not final as it just avoids concurrency issues on statics Fix Expired certificates on Vendorsoftwareproduct Issue-ID: SDC-3467 Signed-off-by: ChrisC Change-Id: I311470b305a29bebffbd74b6f2ad7b13193132e1 --- .../security/SecurityManagerTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org') diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManagerTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManagerTest.java index 306bc322dc..3b24c4feb6 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManagerTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManagerTest.java @@ -110,7 +110,7 @@ public class SecurityManagerTest { @Test public void verifySignedDataTestCertIncludedIntoSignature() throws IOException, URISyntaxException, SecurityManagerException { - PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert"); + PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert"); byte[] signature = readAllBytes("/cert/2-file-signed-package/dummyPnfv4.cms"); byte[] archive = readAllBytes("/cert/2-file-signed-package/dummyPnfv4.csar"); assertTrue(securityManager.verifySignedData(signature, null, archive)); @@ -129,7 +129,7 @@ public class SecurityManagerTest { @Test public void verifySignedDataTestCertNotIncludedIntoSignature() throws IOException, URISyntaxException, SecurityManagerException { - PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert"); + PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert"); byte[] signature = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cms"); byte[] archive = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.csar"); byte[] cert = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cert"); @@ -138,11 +138,11 @@ public class SecurityManagerTest { @Test public void verifySignedDataTestCertIntermediateNotIncludedIntoSignature() throws IOException, URISyntaxException, SecurityManagerException { - PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert"); - PrepareCertFiles("/cert/signing-ca2.crt", cerDirPath + "signing-ca2.crt"); + PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert"); + PrepareCertFiles("/cert/package2.cert", cerDirPath + "signing-ca2.crt"); byte[] signature = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cms"); byte[] archive = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.csar"); - byte[] cert = readAllBytes("/cert/3-file-signed-package/dummyPnfv4-no-intermediate.cert"); + byte[] cert = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cert"); assertTrue(securityManager.verifySignedData(signature, cert, archive)); } @@ -161,7 +161,7 @@ public class SecurityManagerTest { @Test public void verifySignedDataTestCertIncludedIntoSignatureWithWrongIntermediateInDirectory() throws IOException, URISyntaxException, SecurityManagerException { - PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert"); + PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert"); PrepareCertFiles("/cert/signing-ca1.crt", cerDirPath + "signing-ca1.crt"); byte[] signature = readAllBytes("/cert/2-file-signed-package/dummyPnfv4.cms"); byte[] archive = readAllBytes("/cert/2-file-signed-package/dummyPnfv4.csar"); @@ -170,7 +170,7 @@ public class SecurityManagerTest { @Test public void verifySignedDataTestCertWrongIntermediateInDirectory() throws IOException, URISyntaxException, SecurityManagerException { - PrepareCertFiles("/cert/root.cert", cerDirPath + "root.cert"); + PrepareCertFiles("/cert/rootCA.cert", cerDirPath + "root.cert"); PrepareCertFiles("/cert/signing-ca1.crt", cerDirPath + "signing-ca1.crt"); byte[] signature = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.cms"); byte[] archive = readAllBytes("/cert/3-file-signed-package/dummyPnfv4.csar"); -- cgit 1.2.3-korg