summaryrefslogtreecommitdiff
path: root/src/share
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-01 02:52:26 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-01 02:52:26 -0500
commit047780def321f18898c58dcc0e94e09a4b40f465 (patch)
treee60216ccca40d7f39a61bd3d9049e8a5e3420df5 /src/share
parent6b09adf78d79ea76849a43f4af4335a7a89b10c7 (diff)
trying to improve m-a setup; still not successfully tested.
Diffstat (limited to 'src/share')
-rw-r--r--src/share/ma/setup15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 944bb4d..764fdb8 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -45,15 +45,14 @@ EOF
local CORE_UID=$(printf "Monkeysphere authentication trust core UID (random string: %s)" $(head -c21 </dev/urandom | base64))
- if gpg_core --gen-key --batch <<EOF
-Key-Type: RSA
-Key-Length: 2048
-Key-Usage: certify
-Name-Real: $CORE_UID
+ local TMPLOC=$(mktemp -d ${MATMPDIR}/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!"
+ ssh-keygen -q -b 2048 -t rsa -N'' "${TMPLOC}/authkey" || failure "Could not generate new key for Monkeysphere authentication trust core"
+
+ # FIXME: pem2openpgp currently sets the A flag and a short
+ # expiration date. We should set the C flag and no expiration
+ # date.
+ < "${TMPLOC}/authkey" pem2openpgp "$CORE_UID" | gpg --import || failure "Could not import new key for Monkeysphere authentication trust core"
-%commit
-%echo done
-EOF
then
CORE_FPR=$(gpg_core --with-colons --fixed-list-mode --fingerprint --list-secret-key | grep ^fpr: | cut -f10 -d: )
if [ -z "$CORE_FPR" ] ; then