summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/share/ma/setup4
-rwxr-xr-xtests/basic5
2 files changed, 3 insertions, 6 deletions
diff --git a/src/share/ma/setup b/src/share/ma/setup
index a829a98..944bb4d 100644
--- 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 bf6a364..c3d3208 100755
--- 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..."