Module Name: src
Committed By: christos
Date: Sun Sep 23 13:34:58 UTC 2018
Modified Files:
src/tests/crypto/libcrypto: Makefile Makefile.inc t_ciphers.sh
src/tests/crypto/libcrypto/evp: Makefile
src/tests/crypto/libcrypto/idea: Makefile
src/tests/crypto/libcrypto/mdc2: Makefile
src/tests/crypto/libcrypto/rc5: Makefile
Log Message:
Merge openssl-1.1.1
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tests/crypto/libcrypto/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/tests/crypto/libcrypto/t_ciphers.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/evp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/idea/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/mdc2/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/rc5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.13 src/tests/crypto/libcrypto/Makefile:1.14
--- src/tests/crypto/libcrypto/Makefile:1.13 Thu Feb 22 09:24:03 2018
+++ src/tests/crypto/libcrypto/Makefile Sun Sep 23 09:34:57 2018
@@ -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
Index: src/tests/crypto/libcrypto/Makefile.inc
diff -u src/tests/crypto/libcrypto/Makefile.inc:1.8 src/tests/crypto/libcrypto/Makefile.inc:1.9
--- src/tests/crypto/libcrypto/Makefile.inc:1.8 Thu Feb 8 18:41:26 2018
+++ src/tests/crypto/libcrypto/Makefile.inc Sun Sep 23 09:34:57 2018
@@ -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 @@ CPPFLAGS+= -I${OPENSSLSRC}/crypto/includ
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>
Index: src/tests/crypto/libcrypto/t_ciphers.sh
diff -u src/tests/crypto/libcrypto/t_ciphers.sh:1.5 src/tests/crypto/libcrypto/t_ciphers.sh:1.6
--- src/tests/crypto/libcrypto/t_ciphers.sh:1.5 Sun May 21 10:20:45 2017
+++ src/tests/crypto/libcrypto/t_ciphers.sh Sun Sep 23 09:34:57 2018
@@ -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_head()
}
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
Index: src/tests/crypto/libcrypto/evp/Makefile
diff -u src/tests/crypto/libcrypto/evp/Makefile:1.1 src/tests/crypto/libcrypto/evp/Makefile:1.2
--- src/tests/crypto/libcrypto/evp/Makefile:1.1 Thu Jun 9 01:25:17 2011
+++ src/tests/crypto/libcrypto/evp/Makefile Sun Sep 23 09:34:57 2018
@@ -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
Index: src/tests/crypto/libcrypto/idea/Makefile
diff -u src/tests/crypto/libcrypto/idea/Makefile:1.4 src/tests/crypto/libcrypto/idea/Makefile:1.5
--- src/tests/crypto/libcrypto/idea/Makefile:1.4 Sat Jul 14 00:06:17 2012
+++ src/tests/crypto/libcrypto/idea/Makefile Sun Sep 23 09:34:58 2018
@@ -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
Index: src/tests/crypto/libcrypto/mdc2/Makefile
diff -u src/tests/crypto/libcrypto/mdc2/Makefile:1.4 src/tests/crypto/libcrypto/mdc2/Makefile:1.5
--- src/tests/crypto/libcrypto/mdc2/Makefile:1.4 Sat Jul 14 00:06:17 2012
+++ src/tests/crypto/libcrypto/mdc2/Makefile Sun Sep 23 09:34:58 2018
@@ -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
Index: src/tests/crypto/libcrypto/rc5/Makefile
diff -u src/tests/crypto/libcrypto/rc5/Makefile:1.4 src/tests/crypto/libcrypto/rc5/Makefile:1.5
--- src/tests/crypto/libcrypto/rc5/Makefile:1.4 Sun May 21 10:20:45 2017
+++ src/tests/crypto/libcrypto/rc5/Makefile Sun Sep 23 09:34:58 2018
@@ -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
