X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fm%2Fgen_subkey;h=cf1ed0cc08dd4d0bb9c19672318fa28d8f3d66f1;hb=4665f8508b6bb2b20a424b7176768358d53c59df;hp=9cc6028325a3621ec019b3d242bd53269e6b0573;hpb=749f1d84177c993d6382c1f80737e21d9fb1ee7b;p=monkeysphere.git

diff --git a/src/share/m/gen_subkey b/src/share/m/gen_subkey
index 9cc6028..cf1ed0c 100644
--- a/src/share/m/gen_subkey
+++ b/src/share/m/gen_subkey
@@ -44,12 +44,25 @@ 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
-    # 7 for < 1.4.10
-    # 8 for >= 1.4.10
-    # 7 for < 2.0.13
-    # 8 for >= 2.0.13
-    keyType=8
     editCommands="addkey
 $keyType
 S