From e9603a6446b29090a93dd4ee782dc3b33aca0278 Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Wed, 26 Aug 2009 00:30:36 -0700 Subject: [PATCH] Only try ecdsa if there really is ecdsa support --- tests/kdc/check-kdc.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in index e2f730794..80636666d 100644 --- a/tests/kdc/check-kdc.in +++ b/tests/kdc/check-kdc.in @@ -358,6 +358,7 @@ ${kinit} --password-file=${objdir}/foopassword foo@${R} || \ ${kdestroy} rsa=yes +ecdsa=yes pkinit=no if ${hxtool} info | grep 'rsa: hx509 null RSA' > /dev/null ; then rsa=no @@ -369,6 +370,11 @@ if ${kinit} --help 2>&1 | grep "CA certificates" > /dev/null; then pkinit=yes fi +if ${hxtool} info | grep 'ecdsa: hcrypto null' > /dev/null ; then + ecdsa=no +else + + # If we support pkinit and have RSA, lets try that if test "$pkinit" = yes -a "$rsa" = yes ; then @@ -408,7 +414,7 @@ if test "$pkinit" = yes -a "$rsa" = yes ; then done - if ${hxtool} info | grep 'ecdsa:' > /dev/null ; then + if test "$ecdsa" = yes > /dev/null ; then echo "Trying pk-init (ec certificate)" > messages.log ${kinit} -C FILE:${base}/pkinit-ec.crt,${base}/pkinit-ec.key bar@${R} || \