From: Andre Noll <maan@tuebingen.mpg.de>
Date: Mon, 27 Aug 2018 14:56:26 +0000 (+0200)
Subject: t0004: Always create PEM keys.
X-Git-Tag: v0.6.3~83
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=f14e5c15c82d4bf3b7ea611eab6bce95d4767b61;p=paraslash.git

t0004: Always create PEM keys.

New versions of ssh-keygen create RFC4716 keys by default, which
breakes the test suite. Fortunately, the fix is easy and works also
for old versions of openssh/ssh-keygen.
---

diff --git a/t/t0004-server.sh b/t/t0004-server.sh
index 7e8ea820..03957464 100755
--- a/t/t0004-server.sh
+++ b/t/t0004-server.sh
@@ -83,7 +83,7 @@ test_require_executables "ssh-keygen"
 missing_executables="$result"
 
 if [[ -z "$missing_objects" && -z "$missing_executables" ]]; then
-	ssh-keygen -q -t rsa -b 2048 -N "" -f $privkey
+	ssh-keygen -q -t rsa -b 2048 -N "" -m PEM -f $privkey
 	key_gen_result=$?
 
 	read &>/dev/null < /dev/tcp/localhost/$port