diff options
| author |   Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2021-01-12 10:33:18 +0100 |
|---|---|---|
| committer | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2021-01-13 09:14:31 +0100 |
| commit | 2b9a4f35e2e50fca4304107b5033b6216af0124d (patch) | |
| tree | 554c86f5ddadd2610f5ac554770dede4b3d2b7b8 /csarvalidation/src/main/java/org/onap/cvc/csar/cc | |
| parent | 6aab2c816dad5fa8dda7c1fb4597ad5433c6181c (diff) | |
Add support for signature in PCKS7 format.
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: Ic98d1b9c93c11c484c86338588922c2f347b7c02
Issue-ID: VNFSDK-714
Diffstat (limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/cc')
| -rw-r--r-- | csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/CsarSourceSecurityValidator.java | 2 | ||||
| -rw-r--r-- | csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/Error.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/CsarSourceSecurityValidator.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/CsarSourceSecurityValidator.java index 282b37d..8710c36 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/CsarSourceSecurityValidator.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/CsarSourceSecurityValidator.java @@ -33,7 +33,7 @@ import java.util.List; public class CsarSourceSecurityValidator { public static final String SIGNATURE_FILE_TYPE = "signature"; - private static final String[] ARTIFACT_SIGNATURE_EXTENSIONS = {".sig.cms"}; + private static final String[] ARTIFACT_SIGNATURE_EXTENSIONS = {".sig.cms",".sig.p7b",".sig.p7c"}; public static final String CERTIFICATE_FILE_TYPE = "certificate"; private static final String[] ARTIFACT_CERTIFICATE_EXTENSIONS = {".cert"}; diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/Error.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/Error.java index 72b036f..f74b6a5 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/Error.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/Error.java @@ -170,9 +170,9 @@ public class Error { public static class CSARErrorFailToLoadArtifactSignature extends CSARArchive.CSARError { - public CSARErrorFailToLoadArtifactSignature(String path, String cms) { + public CSARErrorFailToLoadArtifactSignature(String source, String signature) { super("0x4019"); - this.message = String.format("Fail to load signature '%s', for source '%s'!", path, cms); + this.message = String.format("Fail to load signature '%s', for source '%s'!", signature, source); } } |