 @@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2018/02/22 14:24:03 martin Exp $
+# $NetBSD: Makefile,v 1.14 2018/09/23 13:34:57 christos Exp $
 .include <bsd.own.mk>
 SUBDIR+=bf bn cast conf des dh dsa ec ecdh ecdsa engine evp hmac \
-	md2 md4 md5 rand rc2 rc4 ripemd rsa sha1 srp threads
+	md2 rc2 rc4 rsa srp threads
 SUBDIR+=idea mdc2
 SUBDIR+=rc5
 .if ${HAVE_OPENSSL} == 10
 SUBDIR += lhash sha x509v3
 .endif
 TESTSDIR=	${TESTSBASE}/crypto/libcrypto
 .if ${HAVE_OPENSSL} == 10
 TESTS_SH=	t_certs
 .endif

 @@ -1,35 +1,36 @@
-# $NetBSD: Makefile.inc,v 1.8 2018/02/08 23:41:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2018/09/23 13:34:57 christos Exp $
 .include <bsd.own.mk>
 .include "../Makefile.inc"
 TESTSDIR=	${TESTSBASE}/crypto/libcrypto
 ATFFILE=	no
 .if defined(HELPER_NAME)
 HELPER_SRCS?=	${HELPER_NAME}.c
 PROG=		h_${HELPER_NAME}
 SRCS=		${HELPER_SRCS}
 MAN=		# empty
 BINDIR=		${TESTSDIR}
 DPADD+=		${LIBCRYPTO} ${LIBCRYPT}
 LDADD+=		-lcrypto -lcrypt
 CWARNFLAGS.clang+=	-Wno-format
 CPPFLAGS+=	-DOPENSSL_FIPS
 CPPFLAGS+=	-I${OPENSSLSRC} -I${OPENSSLSRC}/crypto
 CPPFLAGS+=	-I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
 CPPFLAGS+=	-I${OPENSSLSRC}/crypto/include
 CRYPTODIST=	${NETBSDSRCDIR}/crypto
 .include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
 .if ${HAVE_OPENSSL} != 10
-.PATH:	${OPENSSLSRC}/test
+.PATH:	${OPENSSLSRC}/test ${OPENSSLSRC}/test/testutil
 .else
 .PATH: ${OPENSSLSRC}/crypto/${HELPER_DIR}
 .endif
 PROGDPLIBS+=	cryptotest ${OPENSSLSRC}/../lib/libcryptotest
 .include <bsd.test.mk>
 .include <bsd.prog.mk>
 .endif

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	# $NetBSD: t_ciphers.sh,v 1.5 2017/05/21 14:20:45 riastradh Exp $	1	# $NetBSD: t_ciphers.sh,v 1.6 2018/09/23 13:34:57 christos Exp $
2	#	2	#
3	# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.	3	# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
4	# All rights reserved.	4	# All rights reserved.
5	#	5	#
6	# Redistribution and use in source and binary forms, with or without	6	# Redistribution and use in source and binary forms, with or without
7	# modification, are permitted provided that the following conditions	7	# modification, are permitted provided that the following conditions
8	# are met:	8	# are met:
9	# 1. Redistributions of source code must retain the above copyright	9	# 1. Redistributions of source code must retain the above copyright
10	# notice, this list of conditions and the following disclaimer.	10	# notice, this list of conditions and the following disclaimer.
11	# 2. Redistributions in binary form must reproduce the above copyright	11	# 2. Redistributions in binary form must reproduce the above copyright
12	# notice, this list of conditions and the following disclaimer in the	12	# notice, this list of conditions and the following disclaimer in the
13	# documentation and/or other materials provided with the distribution.	13	# documentation and/or other materials provided with the distribution.
14	#	14	#
	@@ -53,27 +53,29 @@ des_head()		@@ -53,27 +53,29 @@ des_head()
53	}	53	}
54	des_body()	54	des_body()
55	{	55	{
56	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_destest"	56	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_destest"
57	}	57	}
58		58
59	atf_test_case evp	59	atf_test_case evp
60	evp_head()	60	evp_head()
61	{	61	{
62	atf_set "descr" "Checks EVP cipher"	62	atf_set "descr" "Checks EVP cipher"
63	}	63	}
64	evp_body()	64	evp_body()
65	{	65	{
66	atf_check -o ignore -e ignore $(atf_get_srcdir)/h_evp_test $(atf_get_srcdir)/evptests.txt	66	for i in $(atf_get_srcdir)/evp*.txt; do
		67	atf_check -o ignore -e ignore $(atf_get_srcdir)/h_evp_test $i
		68	done
67	}	69	}
68		70
69	atf_test_case rc2	71	atf_test_case rc2
70	rc2_head()	72	rc2_head()
71	{	73	{
72	atf_set "descr" "Checks RC2 cipher"	74	atf_set "descr" "Checks RC2 cipher"
73	}	75	}
74	rc2_body()	76	rc2_body()
75	{	77	{
76	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_rc2test"	78	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_rc2test"
77	}	79	}
78		80
79	atf_test_case rc4	81	atf_test_case rc4

 @@ -1,8 +1,18 @@
-# $NetBSD: Makefile,v 1.1 2011/06/09 05:25:17 spz Exp $
+# $NetBSD: Makefile,v 1.2 2018/09/23 13:34:57 christos Exp $
 HELPER_NAME=	evp_test
 HELPER_DIR=	evp
-FILES=		evptests.txt
+FILES= \
 evpcase.txt \
 evpciph.txt \
 evpdigest.txt \
 evpencod.txt \
 evpkdf.txt \
 evpmac.txt \
 evppbe.txt \
 evppkey.txt \
 evppkey_ecc.txt
 .include <bsd.init.mk>
 .PATH: ${OPENSSLSRC}/test/recipes/30-test_evp_data

 @@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2012/07/14 04:06:17 christos Exp $
+# $NetBSD: Makefile,v 1.5 2018/09/23 13:34:58 christos Exp $
 HELPER_NAME=	ideatest
 HELPER_DIR=	idea
 .include <bsd.init.mk>
 LDADD= -lcrypto
 LDADD+=		-Wl,--no-fatal-warnings

 @@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2012/07/14 04:06:17 christos Exp $
+# $NetBSD: Makefile,v 1.5 2018/09/23 13:34:58 christos Exp $
 HELPER_NAME=	mdc2test
 HELPER_DIR=	mdc2
 .include <bsd.init.mk>
 LDADD= -lcrypto
 LDADD+=         -Wl,--no-fatal-warnings

 @@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2017/05/21 14:20:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2018/09/23 13:34:58 christos Exp $
 HELPER_NAME=	rc5test
 HELPER_DIR=	rc5
 .include <bsd.init.mk>
 LDADD= -lcrypto
 LDADD+=		-Wl,--no-fatal-warnings