X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fm%2Fgen_subkey;h=cf1ed0cc08dd4d0bb9c19672318fa28d8f3d66f1;hb=cf7d2f1e843e429a462d2dd11430fd48b0281cb2;hp=a0fa3ce77228b5f6b7efc876ccf3a22098a2d38c;hpb=abd2c7a17b57d7b802353c851c2150b07824a3a5;p=monkeysphere.git

diff --git a/src/share/m/gen_subkey b/src/share/m/gen_subkey
index a0fa3ce..cf1ed0c 100644
--- a/src/share/m/gen_subkey
+++ b/src/share/m/gen_subkey
@@ -19,6 +19,7 @@ gen_subkey(){
     local keyID
     local editCommands
     local fifoDir
+    local keyType
 
     # get options
     while true ; do
@@ -43,9 +44,27 @@ Type '$PGRM help' for usage."
     # check that an authentication subkey does not already exist
     check_gpg_authentication_subkey "$keyID"
 
+    # determine which keyType to use from gpg version
+    keyType=7
+    case $(gpg --version | head -1 | awk '{ print $3 }' | cut -d. -f1) in
+	1)
+	    if is_gpg_version_greater_equal 1.4.10 ; then
+		keyType=8
+	    fi
+	    ;;
+	2)
+	    if is_gpg_version_greater_equal 2.0.13 ; then
+		keyType=8
+	    fi
+	    ;;
+	*)
+	    keyType=8
+	    ;;
+    esac
+
     # generate the list of commands that will be passed to edit-key
     editCommands="addkey
-7
+$keyType
 S
 E
 A
@@ -57,14 +76,16 @@ save"
     # setup the temp fifo dir for retrieving the key password
     log debug "creating password fifo..."
     fifoDir=$(msmktempdir)
-    trap "rm -rf $fifoDir" EXIT
     (umask 077 && mkfifo "$fifoDir/pass")
 
-    log verbose "generating subkey..."
+    # FIXME: are we adequately cleaning up any trailing gpg process here?
+    trap "rm -rf $fifoDir; kill %% || true" EXIT
     echo "$editCommands" | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" &
 
+    log debug "Prompting for passphrase"
     # FIXME: this needs to fail more gracefully if the passphrase is incorrect
     passphrase_prompt  "Please enter your passphrase for $keyID: " "$fifoDir/pass"
+    log info "Generating subkey.  This may take a long time..."
 
     trap - EXIT
     rm -rf "$fifoDir"