Test: restconf CN variable, strip curl newline

Fixed a few compile warnings

test/lib.sh

@@ -105,6 +105,9 @@ else
     netcat=
 fi
 
+# SSL serv cert common name XXX should use DNS resolve
+: ${SSLCN:="localhost"}
+
 # Options passed to curl calls
 # -s : silent
 # -S : show error
@@ -1104,7 +1107,7 @@ prompt = no
 distinguished_name = dn
 req_extensions = ext
 [dn]
-CN = www.clicon.org # localhost
+CN = ${SSLCN} # localhost
 emailAddress = olof@hagsand.se
 O = Clixon
 L = Stockholm

test/test_perf_restconf.sh

@@ -151,7 +151,8 @@ cat $fdataxml >> $ftest
 echo -n "</data>" >> $ftest
 # -i (ignore case) dont always work properly
 sed '/<data>/!d' $foutput > $foutput2
-mv $foutput2 $foutput
+# Strip potential newlines, curl seems to leave trailing newlines on some platforms/versions
+tr -d "\n\r" < $foutput2 > $foutput
 
 ret=$(diff -i $ftest $foutput)
 if [ $? -ne 0 ]; then

test/test_restconf_nmap.sh

@@ -153,7 +153,7 @@ new "nmap ssl-cert-intaddr"
 expectpart "$(nmap --script ssl-cert-intaddr -p 443 127.0.0.1)" 0 "443/tcp open  https"
 
 new "nmap ssl-cert"
-expectpart "$(nmap --script ssl-cert -p 443 127.0.0.1)" 0 "443/tcp open  https" "| ssl-cert: Subject: commonName=www.clicon.org/organizationName=Clixon/countryName=SE"
+expectpart "$(nmap --script ssl-cert -p 443 127.0.0.1)" 0 "443/tcp open  https" "| ssl-cert: Subject: commonName=${SSLCN}/organizationName=Clixon/countryName=SE"
 
 new "nmap ssl-date"
 expectpart "$(nmap --script ssl-date -p 443 127.0.0.1)" 0 "443/tcp open  https"