From ad4da5f04371a2d772a8bed49ca4884455900560 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Mon, 26 Dec 2016 15:49:53 +0800
Subject: [PATCH] fix cerrificate bundle issue. (#1266)

LGTM
---
 tools/ova/script/config.sh | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tools/ova/script/config.sh b/tools/ova/script/config.sh
index ad6bb7979..f932f5386 100755
--- a/tools/ova/script/config.sh
+++ b/tools/ova/script/config.sh
@@ -42,15 +42,18 @@ flag=$base_dir/cert_gen_type
 #The location of harbor.cfg
 cfg=$base_dir/harbor/harbor.cfg
 
-#Format cert and key files
-function format {
-	file=$1
-	head=$(sed -rn 's/(-+[A-Za-z ]*-+)([^-]*)(-+[A-Za-z ]*-+)/\1/p' $file)
-	body=$(sed -rn 's/(-+[A-Za-z ]*-+)([^-]*)(-+[A-Za-z ]*-+)/\2/p' $file)
-	tail=$(sed -rn 's/(-+[A-Za-z ]*-+)([^-]*)(-+[A-Za-z ]*-+)/\3/p' $file)
-	echo $head > $file
-	echo $body | sed  's/\s\+/\n/g' >> $file
-	echo $tail >> $file
+#Format cert file
+function formatCert {
+	content=$1
+	file=$2
+	echo $content | sed -r "s/ /\n/g" | sed -r "/-+$/d" | sed -r "s/^(-+).*/& CERTIFICATE\1/g" > $file
+}
+
+#Format key file
+function formatKey {
+	content=$1
+	file=$2
+	echo $content | sed -r "s/ /\n/g" | sed -r "/^PRIVATE$/d"| sed -r "/-+$/d" | sed -r "s/^(-+).*/& PRIVATE KEY\1/g" > $file
 }
 
 function genCert {
@@ -81,10 +84,8 @@ function secure {
 	if [ -n "$ssl_cert" ] && [ -n "$ssl_cert_key" ]
 	then
 		echo "ssl_cert and ssl_cert_key are both set, using customized certificate"
-		echo $ssl_cert > $cert
-		format $cert
-		echo $ssl_cert_key > $key
-		format $key
+		formatCert "$ssl_cert" $cert
+		formatKey "$ssl_cert_key" $key
 		echo "customized" > $flag
 		return
 	fi