hostkey without encryption

diff --git a/bin/generate-test-certificates.sh b/bin/generate-test-certificates.sh
index e864eab..e57e7d7 100755 (executable)
--- a/bin/generate-test-certificates.sh
+++ b/bin/generate-test-certificates.sh
@@ -27,6 +27,12 @@ CONFIGDIR=$PWD/$(dirname $0)/../test
 export PASSWORD='changeit'
 DAYS=10000
 
+##PROJDIR=$PWD/$(dirname $0)/../project
+##VERSION='v'
+##VERSION=${VERSION}$(awk -F'[ =]' '/module.version/ { print $2} ' project/version.properties)
+##VERSION=${VERSION}'-'
+##VERSION=${VERSION}$(awk -F'[ =]' '/module.age/ { print $2} ' project/version.properties)
+
 # generating the PKCS#12 format
 function create_p12 {
     name=$1
@@ -37,6 +43,7 @@ function create_p12 {
 
 function create_cert {
     filebase=$1
+    ##export CN="$VERSION "$2
     export CN=$2
     flags=$3
     validity=$4
@@ -113,7 +120,7 @@ function create_some {
     cp $CA_DIR/${catype}.cert grid-security/certificates/${hash}.0
     cp $CA_DIR/${catype}.crl grid-security/certificates/${hash}.r0
     cp $CERT_DIR/${catype}_server.cert grid-security/hostcert.pem
-    cp $CERT_DIR/${catype}_server.priv grid-security/hostkey.pem
+    openssl rsa -passin pass:$PASSWORD -in $CERT_DIR/${catype}_server.priv -out grid-security/hostkey.pem
     
     if [ ! -d 'home' ]; then
         mkdir 'home'