[src/trunk]: src/tests/crypto/libcrypto Merge openssl-1.1.1

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6bc3a551fb40
branches:  trunk
changeset: 433600:6bc3a551fb40
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Sep 23 13:34:57 2018 +0000

description:
Merge openssl-1.1.1

diffstat:

 tests/crypto/libcrypto/Makefile      |   4 ++--
 tests/crypto/libcrypto/Makefile.inc  |   5 +++--
 tests/crypto/libcrypto/evp/Makefile  |  14 ++++++++++++--
 tests/crypto/libcrypto/idea/Makefile |   3 +--
 tests/crypto/libcrypto/mdc2/Makefile |   3 +--
 tests/crypto/libcrypto/rc5/Makefile  |   3 +--
 tests/crypto/libcrypto/t_ciphers.sh  |   6 ++++--
 7 files changed, 24 insertions(+), 14 deletions(-)

diffs (123 lines):

diff -r 2dc60550f1f9 -r 6bc3a551fb40 tests/crypto/libcrypto/Makefile
--- a/tests/crypto/libcrypto/Makefile   Sun Sep 23 13:32:54 2018 +0000
+++ b/tests/crypto/libcrypto/Makefile   Sun Sep 23 13:34:57 2018 +0000
@@ -1,9 +1,9 @@
-# $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
diff -r 2dc60550f1f9 -r 6bc3a551fb40 tests/crypto/libcrypto/Makefile.inc
--- a/tests/crypto/libcrypto/Makefile.inc       Sun Sep 23 13:32:54 2018 +0000
+++ b/tests/crypto/libcrypto/Makefile.inc       Sun Sep 23 13:34:57 2018 +0000
@@ -1,4 +1,4 @@
-# $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"
@@ -25,10 +25,11 @@
 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>
diff -r 2dc60550f1f9 -r 6bc3a551fb40 tests/crypto/libcrypto/evp/Makefile
--- a/tests/crypto/libcrypto/evp/Makefile       Sun Sep 23 13:32:54 2018 +0000
+++ b/tests/crypto/libcrypto/evp/Makefile       Sun Sep 23 13:34:57 2018 +0000
@@ -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
diff -r 2dc60550f1f9 -r 6bc3a551fb40 tests/crypto/libcrypto/idea/Makefile
--- a/tests/crypto/libcrypto/idea/Makefile      Sun Sep 23 13:32:54 2018 +0000
+++ b/tests/crypto/libcrypto/idea/Makefile      Sun Sep 23 13:34:57 2018 +0000
@@ -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
diff -r 2dc60550f1f9 -r 6bc3a551fb40 tests/crypto/libcrypto/mdc2/Makefile
--- a/tests/crypto/libcrypto/mdc2/Makefile      Sun Sep 23 13:32:54 2018 +0000
+++ b/tests/crypto/libcrypto/mdc2/Makefile      Sun Sep 23 13:34:57 2018 +0000
@@ -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
diff -r 2dc60550f1f9 -r 6bc3a551fb40 tests/crypto/libcrypto/rc5/Makefile
--- a/tests/crypto/libcrypto/rc5/Makefile       Sun Sep 23 13:32:54 2018 +0000
+++ b/tests/crypto/libcrypto/rc5/Makefile       Sun Sep 23 13:34:57 2018 +0000
@@ -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
diff -r 2dc60550f1f9 -r 6bc3a551fb40 tests/crypto/libcrypto/t_ciphers.sh
--- a/tests/crypto/libcrypto/t_ciphers.sh       Sun Sep 23 13:32:54 2018 +0000
+++ b/tests/crypto/libcrypto/t_ciphers.sh       Sun Sep 23 13:34:57 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_ciphers.sh,v 1.5 2017/05/21 14:20:45 riastradh Exp $
+# $NetBSD: t_ciphers.sh,v 1.6 2018/09/23 13:34:57 christos Exp $
 #
 # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -63,7 +63,9 @@
 }
 evp_body()
 {
-       atf_check -o ignore -e ignore $(atf_get_srcdir)/h_evp_test $(atf_get_srcdir)/evptests.txt
+       for i in $(atf_get_srcdir)/evp*.txt; do
+           atf_check -o ignore -e ignore $(atf_get_srcdir)/h_evp_test $i
+       done
 }
 
 atf_test_case rc2