summaryrefslogtreecommitdiff
path: root/src/share/ma
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-02 11:34:26 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-02 11:34:26 -0500
commit10c741dac082844fbf9a2fbbfc4322f718c2abea (patch)
treef319daa186b19056dbc153e2814b46a8c8918e30 /src/share/ma
parentc1900d82be5fe3607bac4248033fe92b56dca597 (diff)
add ability to specify key length of core secret key, so the test scripts can specify something smaller than the default.
Diffstat (limited to 'src/share/ma')
-rw-r--r--src/share/ma/setup6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 90f748e..422cfd3 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -56,13 +56,13 @@ EOF
local TMPLOC=$(mktemp -d "${MATMPDIR}"/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!"
# generate the key with ssh-keygen...
- log debug "generating ssh key..."
- ssh-keygen -q -b 1024 -t rsa -N '' -f "${TMPLOC}/authkey" || failure "Could not generate new key for Monkeysphere authentication trust core"
+ 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 pgp key and importing into core..."
+ 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"
# get fingerprint of core key. should definitely not be empty at this point