From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 7 Jan 2010 19:37:47 +0000 (-0200)
Subject: Misc fixes
X-Git-Tag: 0.2.1~156
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a31b634f7ec127b45142dfe786a32b73055324ac;p=keyringer.git

Misc fixes
---

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index d706d5b..19d677f 100644
--- 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 225e62e..d2cba12 100755
--- 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