From 77244afe3b6d013b485e0952eaab89b9db83380f Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 21 Dec 2013 17:02:39 +1100 Subject: [PATCH] 20131221 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types. --- ChangeLog | 3 +++ regress/keytype.sh | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b64040c0..017c05a73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +20131221 + - (dtucker) [regress/keytype.sh] Actually test ecdsa key types. + 20131219 - (dtucker) [configure.ac] bz#2178: Don't try to use BSM on Solaris versions greater than 11 either rather than just 11. Patch from Tomas Kuthan. diff --git a/regress/keytype.sh b/regress/keytype.sh index 2c57ec6b1..9752acb0a 100644 --- a/regress/keytype.sh +++ b/regress/keytype.sh @@ -11,12 +11,14 @@ fi cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak +# Traditional and builtin key types. ktypes="dsa-1024 rsa-2048 rsa-3072 ed25519-512" +# Types not present in all OpenSSL versions. for i in `$SSH -Q key`; do case "$i" in - ecdsa-sha2-nistp256) ktype="$ktype ecdsa-256" ;; - ecdsa-sha2-nistp384) ktype="$ktype ecdsa-384" ;; - ecdsa-sha2-nistp521) ktype="$ktype ecdsa-521" ;; + ecdsa-sha2-nistp256) ktypes="$ktypes ecdsa-256" ;; + ecdsa-sha2-nistp384) ktypes="$ktypes ecdsa-384" ;; + ecdsa-sha2-nistp521) ktypes="$ktypes ecdsa-521" ;; esac done