From b4a1544ad518e50e1e4354f5bf590c5564f919a8 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Mon, 24 Sep 2018 16:25:24 +0000
Subject: [PATCH] Remove tests that don't exist anymore in OpenSSL-1.1.1 (We
 should add the one ones it adds though :-)

---
 tests/crypto/libcrypto/t_hashes.sh    | 47 +--------------------------
 tests/crypto/libcrypto/t_libcrypto.sh | 25 +-------------
 2 files changed, 2 insertions(+), 70 deletions(-)

diff --git a/tests/crypto/libcrypto/t_hashes.sh b/tests/crypto/libcrypto/t_hashes.sh
index 0883072ba9c4..a4f2baaf7c3f 100644
--- a/tests/crypto/libcrypto/t_hashes.sh
+++ b/tests/crypto/libcrypto/t_hashes.sh
@@ -1,4 +1,4 @@
-# $NetBSD: t_hashes.sh,v 1.3 2018/02/22 14:24:03 martin Exp $
+# $NetBSD: t_hashes.sh,v 1.4 2018/09/24 16:25:24 christos Exp $
 #
 # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -45,47 +45,6 @@ md2_body()
 	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_md2test"
 }
 
-atf_test_case md4
-md4_head()
-{
-	atf_set "descr" "Checks MD4 digest"
-}
-md4_body()
-{
-	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_md4test"
-}
-
-atf_test_case md5
-md5_head()
-{
-	atf_set "descr" "Checks MD5 digest"
-}
-md5_body()
-{
-	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_md5test"
-}
-
-atf_test_case ripemd
-ripemd_head()
-{
-	atf_set "descr" "Checks RMD-160 digest"
-}
-ripemd_body()
-{
-	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_ripemdtest"
-}
-
-atf_test_case sha
-sha_head()
-{
-	atf_set "descr" "Checks SHA-1 digest"
-}
-sha_body()
-{
-	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_shatest"
-}
-
-
 atf_test_case mdc2
 mdc2_head()
 {
@@ -100,9 +59,5 @@ atf_init_test_cases()
 {
 	atf_add_test_case hmac
 	atf_add_test_case md2
-	atf_add_test_case md4
-	atf_add_test_case md5
-	atf_add_test_case ripemd
-	openssl version | fgrep -q "OpenSSL 1.0" && atf_add_test_case sha
 	atf_add_test_case mdc2
 }
diff --git a/tests/crypto/libcrypto/t_libcrypto.sh b/tests/crypto/libcrypto/t_libcrypto.sh
index 8287cf699420..da55f41b13db 100644
--- a/tests/crypto/libcrypto/t_libcrypto.sh
+++ b/tests/crypto/libcrypto/t_libcrypto.sh
@@ -1,4 +1,4 @@
-# $NetBSD: t_libcrypto.sh,v 1.5 2018/02/22 14:24:03 martin Exp $
+# $NetBSD: t_libcrypto.sh,v 1.6 2018/09/24 16:25:24 christos Exp $
 #
 # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -35,16 +35,6 @@ engine_body()
 	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_enginetest"
 }
 
-atf_test_case rand
-rand_head()
-{
-	atf_set "descr" "Checks peudo-random number generator"
-}
-rand_body()
-{
-	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_randtest"
-}
-
 atf_test_case bn
 bn_head()
 {
@@ -71,17 +61,6 @@ conf_body()
 		$(atf_get_srcdir)/h_conftest
 }
 
-atf_test_case lhash
-lhash_head()
-{
-	atf_set "descr" "Checks lhash - dynamic hash tables"
-}
-lhash_body()
-{
-	atf_check -o ignore -e ignore -x \
-		"echo hoge | $(atf_get_srcdir)/h_lhashtest"
-}
-
 atf_test_case threads
 threads_head()
 {
@@ -99,9 +78,7 @@ threads_body()
 atf_init_test_cases()
 {
 	atf_add_test_case engine
-	atf_add_test_case rand
 	atf_add_test_case bn
 	atf_add_test_case conf
-	openssl version | fgrep -q "OpenSSL 1.0" && atf_add_test_case lhash
 	atf_add_test_case threads
 }