From 6bdd924968ceccf33a86482aa720609d1c156741 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Thu, 21 Nov 2019 18:33:20 +0800 Subject: Support new version of openssl 1. Support new version of openssl >= 1.1.1. 2. Add a blank line between digest and signature section per spec SOL004. Issue-ID: VNFSDK-519 Change-Id: I92873897805ab627a31eb5c09450e33b2f091db5 Signed-off-by: Lianhao Lu --- vnfsdk_pkgtools/packager/manifest.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vnfsdk_pkgtools/packager/manifest.py') diff --git a/vnfsdk_pkgtools/packager/manifest.py b/vnfsdk_pkgtools/packager/manifest.py index b2d0804..5066f45 100644 --- a/vnfsdk_pkgtools/packager/manifest.py +++ b/vnfsdk_pkgtools/packager/manifest.py @@ -159,9 +159,11 @@ class Manifest(object): ret += "Source: %s\n" % key ret += "Algorithm: %s\n" % digest[0] ret += "Hash: %s\n" % digest[1] + if self.digests: + # empty line between digest and signature section + ret += "\n" # signature if self.signature: - ret += "\n" ret += self.signature return ret @@ -190,8 +192,7 @@ class Manifest(object): elif not skip: lines.append(line) # strip trailing empty lines - content = ''.join(lines).rstrip(' \n\t') - content += '\n' + content = ''.join(lines) tmpfile = tempfile.NamedTemporaryFile(mode='w',delete=False) tmpfile.write(content) tmpfile.close() -- cgit 1.2.3-korg