add ability to specify key length of core secret key, so the test scripts can specify...

[monkeysphere.git] / src / share / ma / setup

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 90f748e40d149cbea9bb546090ea4991b8ba1d79..422cfd3efcc58e009bb10b2370e59ee5219fbc16 100644 (file)
--- 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