summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Eiselt <herbert.eiselt@highstreet-technologies.com>2021-02-12 09:04:28 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-12 09:04:28 +0000
commit9324e5ea257d29a9302d2da045c70ae270ddaed2 (patch)
treefd2a0f4df4d8632a3deb84547e94b9b208be9707
parent8d6c3538ebaad19a744408980cfbd636931de915 (diff)
parentb204ccf7befb715383c8828d85247035318450b9 (diff)
Merge "Fix issue with certificates conversion"
Former-commit-id: 946d17b0acab6b36600b6517a2ca0dd263851ff9
-rw-r--r--installation/sdnc/src/main/scripts/installCerts.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/installation/sdnc/src/main/scripts/installCerts.py b/installation/sdnc/src/main/scripts/installCerts.py
index 6ca3bbc9..220cafd1 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.
@@ -283,6 +284,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())