From 8db4db6563a98c4fac3e833707ab2b14098657d5 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Fri, 22 Nov 2019 10:11:45 +0800 Subject: Support non DOS/Windows format CSAR manifest file When recreating the csar manifest file during signature verification, we should use the same newline charater as the original file instead of using the DOS/Windows newline charater to avoid false positive signature verfication failure. Issue-ID: VNFSDK-520 Signed-off-by: Lianhao Lu Change-Id: I7bdf0a7f6b46c7def0a92d7ec7f245e268355959 --- .../java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java') diff --git a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java index 16b6942..701c524 100644 --- a/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java +++ b/csarvalidation/src/main/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR130206.java @@ -254,15 +254,17 @@ class ManifestFileSignatureValidator { boolean isValid(File manifestFile) { try { ManifestFileModel mf = manifestFileSplitter.split(manifestFile); - return cmsSignatureValidator.verifySignedData(toBytes(mf.getCMS()), Optional.empty(), toBytes(mf.getData())); + return cmsSignatureValidator.verifySignedData(toBytes(mf.getCMS(), mf.getNewLine()), + Optional.empty(), + toBytes(mf.getData(), mf.getNewLine())); } catch (CmsSignatureValidatorException e) { LOG.error("Unable to verify signed data!", e); return false; } } - private byte[] toBytes(List data) { - final String updatedData = data.stream().map(it -> it + "\r\n").collect(Collectors.joining()); + private byte[] toBytes(List data, String newLine) { + final String updatedData = data.stream().map(it -> it + newLine).collect(Collectors.joining()); return updatedData.getBytes(Charset.defaultCharset()); } } -- cgit 1.2.3-korg