summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoug <>2015-09-29 01:07:56 +0000
committerdoug <>2015-09-29 01:07:56 +0000
commitfad0b6cea3bf75ce2428a6d4f8ad79068eb81444 (patch)
tree911fe0cc43d428ad6d02dd56eb55a019365bfd2a
parent8120969745e109d6500c765aa47172f27f44b790 (diff)
downloadopenbsd-fad0b6cea3bf75ce2428a6d4f8ad79068eb81444.tar.gz
openbsd-fad0b6cea3bf75ce2428a6d4f8ad79068eb81444.tar.bz2
openbsd-fad0b6cea3bf75ce2428a6d4f8ad79068eb81444.zip
Fix sha2 regression test for libcrypto.
By default, "openssl sha" used SHA-0. However, it was possible to use the form "openssl sha -sha256" to run SHA-256 instead. The regression test used this form. Since we removed SHA-0 support, the regress tests should now call "openssl <digest>". ok guenther@, bcook@
-rw-r--r--src/regress/lib/libcrypto/sha2/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/regress/lib/libcrypto/sha2/Makefile b/src/regress/lib/libcrypto/sha2/Makefile
index e2bbb02d15..e7bccf5f24 100644
--- a/src/regress/lib/libcrypto/sha2/Makefile
+++ b/src/regress/lib/libcrypto/sha2/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.2 2014/08/26 17:50:07 jsing Exp $ 1# $OpenBSD: Makefile,v 1.3 2015/09/29 01:07:56 doug Exp $
2 2
3REGRESS_TARGETS=regress-sha2 3REGRESS_TARGETS=regress-sha2
4OPENSSL=/usr/bin/openssl 4OPENSSL=/usr/bin/openssl
@@ -31,7 +31,7 @@ HASHES= \
31 31
32regress-sha2: 32regress-sha2:
33.for hash input output in ${HASHES} 33.for hash input output in ${HASHES}
34 @(echo -n ${input} | ${OPENSSL} sha -${hash} | (read a b; \ 34 @(echo -n ${input} | ${OPENSSL} ${hash} | (read a b; \
35 test $$b == ${output} || \ 35 test $$b == ${output} || \
36 (echo wrong ${hash} hash of \"${input}\"; \ 36 (echo wrong ${hash} hash of \"${input}\"; \
37 echo expected: ${output}; \ 37 echo expected: ${output}; \