projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initial seminar details -- abstract and feeble outline
[monkeysphere.git]
/
src
/
share
/
m
/
import_subkey
diff --git
a/src/share/m/import_subkey
b/src/share/m/import_subkey
index d71c2581719db705ce4dd8b44afe624b68ef569e..8d60f26aaa849cbeeabbeccd8fc2a6f3ea01a9b7 100644
(file)
--- a/
src/share/m/import_subkey
+++ b/
src/share/m/import_subkey
@@
-13,12
+13,20
@@
# import an existing ssh key as a gpg subkey
# import an existing ssh key as a gpg subkey
+## 2009-02-20 00:49:11-0500: This is not implemented yet, because we
+## don't currently have a good way to manipulate the user's OpenPGP
+## secret key such that we could make a proper subkey binding
+## signature.
+
import_subkey() {
local sshKeyFile
local keyID
local gpgSecOut
local fifoDir
import_subkey() {
local sshKeyFile
local keyID
local gpgSecOut
local fifoDir
+ # FIXME: implement!
+ failure "import-subkey is not implemented yet. We welcome patches. Sorry!"
+
sshKeyFile="$1"
shift
sshKeyFile="$1"
shift
@@
-42,12
+50,12
@@
import_subkey() {
# import ssh key to as authentication subkey
if [ "$sshKeyFile" = '-' ] ; then
log verbose "importing ssh key from stdin..."
# 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'..."
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
fi
# get the password if needed