From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 19 Feb 2009 20:46:23 +0000 (-0500)
Subject: the import_subkey function was in fact not implement at all.  MUST FIX!
X-Git-Tag: monkeysphere_0.23~34^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eaeb05a0c6ae707d09ad1e9c89287d498e7587f3;p=monkeysphere.git

the import_subkey function was in fact not implement at all.  MUST FIX!
---

diff --git a/src/share/m/import_subkey b/src/share/m/import_subkey
index f3ca957..1823f71 100644
--- a/src/share/m/import_subkey
+++ b/src/share/m/import_subkey
@@ -33,6 +33,9 @@ import_subkey() {
     # check that an authentication subkey does not already exist
     check_gpg_authentication_subkey "$keyID"
 
+    # FIXME: implement!
+    failure "implement me!"
+
     # setup the temp fifo dir for retrieving the key password
     log debug "creating password fifo..."
     fifoDir=$(msmktempdir)
@@ -42,11 +45,11 @@ import_subkey() {
     # import ssh key to as authentication subkey
     if [ "$sshKeyFile" = '-' ] ; then
 	log verbose "importing ssh key from stdin..."
-	ssh2openpgp \
+	PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
 	    | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import &
     else
 	log verbose "importing ssh key from file '$sshKeyFile'..."
-	ssh2openpgp <"$sshKeyFile" \
+	PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" <"$sshKeyFile" \
 	    | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import &
     fi