tests: enhanced cert tests with SHA256 key IDs

1 files changed, 19 insertions, 3 deletions

diff --git a/tests/cert-tests/certtool b/tests/cert-tests/certtool
index 39490f9250..cbabb59c0b 100755
--- a/tests/cert-tests/certtool
+++ b/tests/cert-tests/certtool
@@ -28,19 +28,35 @@ VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
 fi
 
 #check whether "funny" spaces can be interpreted
+id=`$VALGRIND $CERTTOOL --key-id --infile $srcdir/funny-spacing.pem --hash sha1`
+rc=$?
+
+if test "$id" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3";then
+	echo "Key-ID1 doesn't match the expected: $id"
+	exit 1
+fi
+
 id=`$VALGRIND $CERTTOOL --key-id --infile $srcdir/funny-spacing.pem`
 rc=$?
 
 if test "$id" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3";then
-	echo "Key-ID doesn't match the expected: 1"
+	echo "Default key-ID1 doesn't match the expected; did the defaults change? ID: $id"
 	exit 1
 fi
 
-id=`$CERTTOOL --pubkey-info <$srcdir/funny-spacing.pem|$CERTTOOL --key-id`
+id=`$CERTTOOL --pubkey-info <$srcdir/funny-spacing.pem|$CERTTOOL --key-id --hash sha1`
 rc=$?
 
 if test "$id" != "1e09d707d4e3651b84dcb6c68a828d2affef7ec3";then
-	echo "Key-ID doesn't match the expected: 2"
+	echo "Key-ID2 doesn't match the expected: $id"
+	exit 1
+fi
+
+id=`$CERTTOOL --pubkey-info <$srcdir/funny-spacing.pem|$CERTTOOL --key-id --hash sha256`
+rc=$?
+
+if test "$id" != "118e72e3655150c895ecbd19b3634179fb4a87c7a25abefcb11f5d66661d5a4d";then
+	echo "Key-ID3 doesn't match the expected: $id"
 	exit 1
 fi