From: Piotr Marcinkiewicz Date: Thu, 11 Feb 2021 10:57:33 +0000 (+0100) Subject: Fix issue with certificates conversion X-Git-Tag: 2.0.6~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=6b738da7242da36816352818e03632867fb8ef46 Fix issue with certificates conversion - Add conversion to string after reading output from openssl Issue-ID: SDNC-1477 Signed-off-by: Piotr Marcinkiewicz Change-Id: Iebc12fde73d33fc79efb1a61db4e3d0963e885de (cherry picked from commit b204ccf7befb715383c8828d85247035318450b9 [formerly 208c90bac2b1a8a9c6511ba1329c10e8fa8b872b]) Former-commit-id: e10f4928513782ec7019e881feedc6884a249284 --- diff --git a/installation/sdnc/src/main/scripts/installCerts.py b/installation/sdnc/src/main/scripts/installCerts.py index d3072847..5c90af5f 100644 --- a/installation/sdnc/src/main/scripts/installCerts.py +++ b/installation/sdnc/src/main/scripts/installCerts.py @@ -2,6 +2,7 @@ # Copyright (C) 2019 Nordix Foundation. # ================================================================================ # extended by highstreet technologies GmbH (c) 2020 +# Copyright (c) 2021 Nokia Intellectual Property. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -273,6 +274,7 @@ def jks_to_p12(file, password): def make_cert_chain(cert_chain, pattern): cert_list = [] if cert_chain: + cert_chain = cert_chain.decode('utf-8') matches = re.findall(pattern, cert_chain, re.DOTALL | re.MULTILINE) for cert in matches: cert_list.append(cert.strip())