removed some unnecessary setup from the basic test, pulling the random string from...

diff --git a/src/share/ma/setup b/src/share/ma/setup
index a829a9845294dce1a614cc1707486f4ec3a0fad9..944bb4d8cf139273ecab799380b1781ab0863269 100644 (file)
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -43,11 +43,11 @@ EOF
     if [ -z "$CORE_FPR" ] ; then
        log info "Setting up Monkeysphere authentication trust core"
 
-       local CORE_UID=$(printf "Monkeysphere authentication trust core UID (random string: %s)" $(head -c21 | base64))
+       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: 4096
+Key-Length: 2048
 Key-Usage: certify
 Name-Real: $CORE_UID
 

diff --git a/tests/basic b/tests/basic
index bf6a364942d0fcbfb6b664609a19567dc368f6d6..c3d3208ce58463eb62a636766d47455a6f8e6974 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -204,14 +204,11 @@ cp "$TESTDIR"/etc/monkeysphere/monkeysphere-authentication.conf "$TEMPDIR"/
 cat <<EOF >> "$TEMPDIR"/monkeysphere-authentication.conf
 AUTHORIZED_USER_IDS="$MONKEYSPHERE_HOME/authentication/authorized_user_ids"
 EOF
-cat <<EOF > "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf
-primary-keyring ${MONKEYSPHERE_SYSDATADIR}/authentication/sphere/pubring.gpg
-keyring ${MONKEYSPHERE_SYSDATADIR}/authentication/core/pubring.gpg
-EOF
 
 # setup server authentication
 echo "### setting up server authentication..."
 monkeysphere-authentication setup
+get_gpg_prng_arg >> "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf
 
 # add admin as identity certifier for testhost
 echo "### adding admin as certifier..."