summaryrefslogtreecommitdiff
path: root/website/bugs/handle-passphrase-locked-secret-keys.mdwn
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-08-18 21:06:24 -0400
committerMicah Anderson <micah@riseup.net>2008-08-18 21:06:24 -0400
commit6ac379bdd75617cfab19c3b175a2e10257444de3 (patch)
tree174a0b650b030fd1f0a43d7de4b87af81ac7e17c /website/bugs/handle-passphrase-locked-secret-keys.mdwn
parent1c1d84bc446cc6d55ba4cd5efc7f5a6c3573fa93 (diff)
parentf4d2a81d7fa375af270b95da25acea8b0a0150e5 (diff)
Merge commit 'jrollins/master'
Diffstat (limited to 'website/bugs/handle-passphrase-locked-secret-keys.mdwn')
-rw-r--r--website/bugs/handle-passphrase-locked-secret-keys.mdwn6
1 files changed, 4 insertions, 2 deletions
diff --git a/website/bugs/handle-passphrase-locked-secret-keys.mdwn b/website/bugs/handle-passphrase-locked-secret-keys.mdwn
index b66e4c7..ae5bf72 100644
--- a/website/bugs/handle-passphrase-locked-secret-keys.mdwn
+++ b/website/bugs/handle-passphrase-locked-secret-keys.mdwn
@@ -36,8 +36,10 @@ work for reasonable values of `$KEYID`:
mkfifo "$TMPDIR/passphrase"
kname="MonkeySphere Key $KEYID"
mkfifo "$TMPDIR/$kname"
- ssh-agent "Please enter the passphrase for MonkeySphere key $KEYID" >"$TMPDIR/passphrase" &
- gpg --passphrase-fd 3 3<"$TMPDIR/passphrase" --export-options export-reset-subkey-passwd,export-minimal,no-export-attributes --export-secret-subkeys "$KEYID"\! | openpgp2ssh "$KEYID" > "$TMPDIR/$kname"
+ ssh-askpass "Please enter the passphrase for MonkeySphere key $KEYID" >"$TMPDIR/passphrase" &
+ gpg --passphrase-fd 3 3<"$TMPDIR/passphrase" \
+ --export-options export-reset-subkey-passwd,export-minimal,no-export-attributes \
+ --export-secret-subkeys "$KEYID"\! | openpgp2ssh "$KEYID" > "$TMPDIR/$kname" &
(cd "$TMPDIR" && ssh-add -c "$kname")
rm -rf "$TMPDIR"