summaryrefslogtreecommitdiff
path: root/src/share/ma
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-05 15:16:05 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-05 15:16:05 -0500
commit9aee235639e1475cd8aa476c7f2335b3c9ae9884 (patch)
treec40fdf87be3b6a2a0631c9b44884502ff1a159f7 /src/share/ma
parent54d5b4d4dd11e432cec4506d1a1eae1d13eb7f0e (diff)
m-a setup: take advantage of the new ability of pem2openpgp to generate its own key.
Diffstat (limited to 'src/share/ma')
-rw-r--r--src/share/ma/setup13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 422cfd3..034f047 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -53,17 +53,8 @@ EOF
local CORE_UID=$(printf "Monkeysphere authentication trust core UID (random string: %s)" $(head -c21 </dev/urandom | base64))
- local TMPLOC=$(mktemp -d "${MATMPDIR}"/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!"
-
- # generate the key with ssh-keygen...
- log debug "generating ssh key ($CORE_KEYLENGTH bits)..."
- ssh-keygen -q -b "$CORE_KEYLENGTH" -t rsa -N '' -f "${TMPLOC}/authkey" || failure "Could not generate new key for Monkeysphere authentication trust core"
- # and then translate to openpgp encoding and import
- # FIXME: pem2openpgp currently sets the A flag and a short
- # expiration date. We should set the C flag and no expiration
- # date.
- log debug "converting ssh key to openpgp key and importing into core..."
- < "${TMPLOC}/authkey" pem2openpgp "$CORE_UID" | gpg_core --import || failure "Could not import new key for Monkeysphere authentication trust core"
+ log debug "generating monkeysphere authentication trust core key ($CORE_KEYLENGTH bits)..."
+ PEM2OPENPGP_USAGE_FLAGS=certify PEM2OPENPGP_NEWKEY=$CORE_KEYLENGTH pem2openpgp "$CORE_UID" | gpg_core --import || failure "Could not import new key for Monkeysphere authentication trust core"
# get fingerprint of core key. should definitely not be empty at this point
log debug "get core key fingerprint..."