X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fm%2Fimport_subkey;h=7333f808d8c8a0f3fe9b14153c53fa02f2a329a7;hb=21e298b8df5108b1337d66ba1a39184be4ce0e4e;hp=d71c2581719db705ce4dd8b44afe624b68ef569e;hpb=bd64869a3b68ff8a020c381371a8ab1e24a5a0e4;p=monkeysphere.git

diff --git a/src/share/m/import_subkey b/src/share/m/import_subkey
index d71c258..7333f80 100644
--- a/src/share/m/import_subkey
+++ b/src/share/m/import_subkey
@@ -19,6 +19,9 @@ import_subkey() {
     local gpgSecOut
     local fifoDir
 
+    # FIXME: implement!
+    failure "implement me!"
+
     sshKeyFile="$1"
     shift
 
@@ -42,12 +45,12 @@ import_subkey() {
     # import ssh key to as authentication subkey
     if [ "$sshKeyFile" = '-' ] ; then
 	log verbose "importing ssh key from stdin..."
-	ssh2openpgp \
-	    | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import &
+	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" \
-	    | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import &
+	PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" <"$sshKeyFile" \
+	    | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import &
     fi
 
     # get the password if needed