Merge commit 'jrollins/master'

2 files changed, 7 insertions, 7 deletions

diff --git a/src/monkeysphere b/src/monkeysphere
index c417625..aaeda11 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -54,9 +54,9 @@ gen_ae_subkey(){
     keyID="$1"
 
     # set subkey defaults
-    SUBKEY_TYPE=${KEY_TYPE:-RSA}
-    SUBKEY_LENGTH=${KEY_LENGTH:-1024}
-    SUBKEY_USAGE=${KEY_USAGE:-encrypt,auth}
+    SUBKEY_TYPE=${KEY_TYPE:-"RSA"}
+    SUBKEY_LENGTH=${KEY_LENGTH:-"1024"}
+    SUBKEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
 
     gpgOut=$(gpg --fixed-list-mode --list-keys --with-colons \
 	"$keyID" 2> /dev/null)
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 34239b6..a109cf5 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -44,10 +44,10 @@ EOF
 # generate server gpg key
 gen_key() {
     # set key defaults
-    KEY_TYPE=${KEY_TYPE:-RSA}
-    KEY_LENGTH=${KEY_LENGTH:-2048}
-    KEY_USAGE=${KEY_USAGE:-encrypt,auth}
-    SERVICE=${SERVICE:-ssh}
+    KEY_TYPE=${KEY_TYPE:-"RSA"}
+    KEY_LENGTH=${KEY_LENGTH:-"2048"}
+    KEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
+    SERVICE=${SERVICE:-"ssh"}
     HOSTNAME_FQDN=${HOSTNAME_FQDN:-$(hostname -f)}
 
     USERID=${USERID:-"$SERVICE"://"$HOSTNAME_FQDN"}