workaround #17362

diff --git a/bin/generate-test-certificates.sh b/bin/generate-test-certificates.sh
index 24d6fcf..596a5d7 100755 (executable)
--- a/bin/generate-test-certificates.sh
+++ b/bin/generate-test-certificates.sh
@@ -295,14 +295,25 @@ function create_voms {
     fi
     export VOMSDIR='grid-security/vomsdir'
 
-    CMD="voms-proxy-fake -pwstdin -hours 168 \
-                    -cert $usercert -key $userkey \
+    # using user credentials for both due to #17362
+    # https://savannah.cern.ch/bugs/index.php?func=detailitem&item_id=17362
+    cp $usercert grid-security/vomsdir/
+    CMD="openssl rsa -in $userkey -out $userkey-nopwd -passin pass:$PASSWORD"
+    echo $CMD
+    $CMD
+    CMD="chmod 600 $userkey-nopwd"
+    $CMD
+
+    CMD="voms-proxy-fake -pwstdin -hours 168 -newformat \
+                    -cert $usercert -key $userkey-nopwd \
                     -certdir grid-security/certificates/ \
-                    -hostcert grid-security/hostcert.pem \
-                    -hostkey grid-security/hostkey.pem \
+                    -hostcert $usercert -hostkey $userkey-nopwd \
                     -out $filename "$(for fqan in $@; do echo -n "-fqan $fqan "; done)
     echo $CMD
-    echo "$PASSWORD" | $CMD
+    $CMD
+
+    CMD="rm $userkey-nopwd"
+    $CMD
 }  
 
 # create some certificates and copy them to convenient locations
@@ -343,6 +354,7 @@ EOF
 
     cp $CERT_DIR/${catype}_server.cert grid-security/hostcert.pem
     openssl rsa -passin pass:$PASSWORD -in $CERT_DIR/${catype}_server.priv -out grid-security/hostkey.pem
+    chmod 400 grid-security/hostkey.pem
     
     if [ ! -d 'home' ]; then
         mkdir 'home'
@@ -742,3 +754,10 @@ if [ "$VOMS" = 'yes' ]; then
     echo "export VOMSDIR=$TARGETDIR/grid-security/vomsdir"
 fi
 
+cat >$TARGETDIR/home/env_settings.sh <<EOF
+export X509_CERT_DIR=$TARGETDIR/grid-security/certificates
+export X509_USER_CERT=$TARGETDIR/home/usercert.pem
+export X509_USER_KEY=$TARGETDIR/home/userkey.pem
+export VOMSDIR=$TARGETDIR/grid-security/vomsdir
+EOF
+