summaryrefslogtreecommitdiffstats
path: root/csarvalidation/src/main/java/org/onap/cvc/csar/cc
diff options
context:
space:
mode:
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.java2
-rw-r--r--csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/r130206/Error.java4
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);
}
}