Misc fixes

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index d706d5b3b3d28c82c9ca8ad58b65e2ac4418f1b5..19d677f3d3f11d0bc2f9a02fced9ae0ff5dc2eb1 100644 (file)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -50,7 +50,11 @@ function keyringer_exec {
 
 # Return a filename with correct extension
 function keyringer_filename {
-  echo `dirname $1`/`basename $1 .asc`.asc
+  if [ -z "$1" ]; then
+    return
+  else
+    echo `dirname $1`/`basename $1 .asc`.asc
+  fi
 }
 
 # Check if a folder is inside a git repository

diff --git a/share/keyringer/genpair b/share/keyringer/genpair
index 225e62ec9a63c7370641a076b7d43e39a1a5f1c6..d2cba12a7c035df92dc2a2c7e0d5a7e9a8c0b945 100755 (executable)
--- a/share/keyringer/genpair
+++ b/share/keyringer/genpair
@@ -72,7 +72,7 @@ function genpair_ssl {
   echo "Encrypting private key into keyringer..."
   cat $NODE"_privatekey.pem" | keyringer_exec encrypt $BASEDIR $FILE.pem
   echo "Encrypting certificate request into keyringer..."
-  cat $NODE"_csr.pem"        | keyringer_exec encrypt $BASEDIR $FILE.csr.pem
+  cat $NODE"_csr.pem"        | keyringer_exec encrypt $BASEDIR $FILE.csr
   echo "Encrypting certificate into keyringer..."
   cat $NODE.crt              | keyringer_exec encrypt $BASEDIR $FILE.crt