Module Name:    src
Committed By:   riastradh
Date:           Sun May 21 14:20:45 UTC 2017

Modified Files:
        src/crypto/external/bsd/openssl/bin: Makefile
        src/crypto/external/bsd/openssl/lib: Makefile
        src/crypto/external/bsd/openssl/lib/libcrypto: rc5.inc
        src/distrib/sets/lists/base: shl.mi
        src/distrib/sets/lists/comp: mi shl.mi
        src/distrib/sets/lists/debug: mi shl.mi
        src/distrib/sets/lists/tests: mi
        src/share/man/man3: intro.3
        src/share/man/man5: mk.conf.5
        src/share/mk: bsd.README bsd.own.mk bsd.prog.mk
        src/tests/crypto/libcrypto: Makefile t_ciphers.sh
        src/tests/crypto/libcrypto/rc5: Makefile
        src/usr.sbin/racoon: Makefile
Removed Files:
        src/crypto/external/bsd/openssl/lib/libcrypto: rc5_enc_dummy.c
            rc5_skey_dummy.c
        src/crypto/external/bsd/openssl/lib/libcrypto_rc5: Makefile
            shlib_version

Log Message:
Remove MKCRYPTO_RC5.  Unconditionally include RC5 in libcrypto.so.

This option existed only because RC5 is covered by patents that, twenty
years ago, we had reason to suspect the patent holder, RSA, Inc., might
litigate.  The two US patents in question are 5,724,428 and 5,835,600.

According to the USPTO Patent Term Calculator web site at
<https://www.uspto.gov/patent/laws-and-regulations/patent-term-calculator#heading-5>
(retrieved 2017-05-21), patents filed after 1995-06-07 expire twenty
years after the filing date.

number          filing date
5,724,428       1995-11-01
5,835,600       1997-04-21

Thus, these patents appear to be expired.

As proposed on tech-crypto and tech-security:

https://mail-index.netbsd.org/tech-crypto/2017/05/05/msg000718.html
https://mail-index.netbsd.org/tech-security/2017/05/05/msg000927.html


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/crypto/external/bsd/openssl/lib/libcrypto/rc5.inc
cvs rdiff -u -r1.2 -r0 \
    src/crypto/external/bsd/openssl/lib/libcrypto/rc5_enc_dummy.c \
    src/crypto/external/bsd/openssl/lib/libcrypto/rc5_skey_dummy.c
cvs rdiff -u -r1.3 -r0 \
    src/crypto/external/bsd/openssl/lib/libcrypto_rc5/Makefile \
    src/crypto/external/bsd/openssl/lib/libcrypto_rc5/shlib_version
cvs rdiff -u -r1.814 -r1.815 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2133 -r1.2134 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.303 -r1.304 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.208 -r1.209 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.173 -r1.174 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.744 -r1.745 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.31 -r1.32 src/share/man/man3/intro.3
cvs rdiff -u -r1.74 -r1.75 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.359 -r1.360 src/share/mk/bsd.README
cvs rdiff -u -r1.1007 -r1.1008 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.304 -r1.305 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.9 -r1.10 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/t_ciphers.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/crypto/libcrypto/rc5/Makefile
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/racoon/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/bin/Makefile
diff -u src/crypto/external/bsd/openssl/bin/Makefile:1.6 src/crypto/external/bsd/openssl/bin/Makefile:1.7
--- src/crypto/external/bsd/openssl/bin/Makefile:1.6	Fri Jul 13 19:32:51 2012
+++ src/crypto/external/bsd/openssl/bin/Makefile	Sun May 21 14:20:44 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2012/07/13 19:32:51 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2017/05/21 14:20:44 riastradh Exp $
 
 WARNS?=	2	# XXX -Wcast-qual
 
@@ -10,7 +10,7 @@ BINDIR=/usr/bin
 USE_FORT?= yes	# cryptographic software
 
 # RCSid:
-#	$Id: Makefile,v 1.6 2012/07/13 19:32:51 christos Exp $
+#	$Id: Makefile,v 1.7 2017/05/21 14:20:44 riastradh Exp $
 #
 #	@(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -40,16 +40,6 @@ SRCS+=	verify.c asn1pars.c req.c dgst.c 
 
 CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC}
 
-# with normal OpenSSL, OPENSSL_NO_RC5 changes ABI due to change in
-# struct/union.  we nuked it in our header files and it is now safe.
-.if ${MKCRYPTO_RC5} == "no"
-CPPFLAGS+= -DOPENSSL_NO_RC5
-.else
-LDADD+=	-lcrypto_rc5
-DPADD+=	${LIBCRYPTO_RC5}
-.endif
-
-# this must be _after_ the libcrypto_rc5/libcrypto_idea entries.
 LDADD+=	-lssl -lcrypto -lcrypt
 DPADD+=	${LIBSSL} ${LIBCRYPTO} ${LIBCRYPT}
 

Index: src/crypto/external/bsd/openssl/lib/Makefile
diff -u src/crypto/external/bsd/openssl/lib/Makefile:1.2 src/crypto/external/bsd/openssl/lib/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/Makefile:1.2	Wed Jul 11 18:50:23 2012
+++ src/crypto/external/bsd/openssl/lib/Makefile	Sun May 21 14:20:44 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2012/07/11 18:50:23 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2017/05/21 14:20:44 riastradh Exp $
 
 .include "bsd.own.mk"
 
@@ -7,10 +7,6 @@
 # OpenSSL libraries.
 SUBDIR= libcrypto libdes
 
-.if (${MKCRYPTO_RC5} != "no")
-SUBDIR+= libcrypto_rc5
-.endif	# MKCRYPTO_RC5 != no
-
 SUBDIR+= .WAIT	libssl		# depends on libcrypto
 
 .endif	# MKCRYPTO != no

Index: src/crypto/external/bsd/openssl/lib/libcrypto/rc5.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/rc5.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/rc5.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/rc5.inc:1.1	Sun Jul 19 23:30:44 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/rc5.inc	Sun May 21 14:20:44 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: rc5.inc,v 1.1 2009/07/19 23:30:44 christos Exp $
+#	$NetBSD: rc5.inc,v 1.2 2017/05/21 14:20:44 riastradh Exp $
 #
 #	@(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -9,10 +9,7 @@
 
 
 RC5_SRCS = rc5_ecb.c rc5cfb64.c rc5ofb64.c
-# RC5 is a patented algorithm; abort().
-# see ../libcrypto_rc5
-RC5_SRCS += rc5_skey_dummy.c rc5_enc_dummy.c
-#SRCS+=rc5_skey.c rc5_enc.c
+RC5_SRCS += rc5_skey.c rc5_enc.c
 SRCS += ${RC5_SRCS}
 
 .for cryptosrc in ${RC5_SRCS}

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.814 src/distrib/sets/lists/base/shl.mi:1.815
--- src/distrib/sets/lists/base/shl.mi:1.814	Sat May 13 15:07:58 2017
+++ src/distrib/sets/lists/base/shl.mi	Sun May 21 14:20:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.814 2017/05/13 15:07:58 maya Exp $
+# $NetBSD: shl.mi,v 1.815 2017/05/21 14:20:44 riastradh Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -229,9 +229,9 @@
 ./usr/lib/libcrypto_idea.so.7.0			base-obsolete		compatfile,obsolete
 ./usr/lib/libcrypto_mdc2.so.7			base-obsolete		compatfile,obsolete
 ./usr/lib/libcrypto_mdc2.so.7.0			base-obsolete		compatfile,obsolete
-./usr/lib/libcrypto_rc5.so			base-crypto-shlib	compatfile,crypto,crypto_rc5
-./usr/lib/libcrypto_rc5.so.12			base-crypto-shlib	compatfile,crypto,crypto_rc5
-./usr/lib/libcrypto_rc5.so.12.0			base-crypto-shlib	compatfile,crypto,crypto_rc5
+./usr/lib/libcrypto_rc5.so			base-obsolete		compatfile,obsolete
+./usr/lib/libcrypto_rc5.so.12			base-obsolete		compatfile,obsolete
+./usr/lib/libcrypto_rc5.so.12.0			base-obsolete		compatfile,obsolete
 ./usr/lib/libctf.so				base-sys-shlib		compatfile,ctf
 ./usr/lib/libctf.so.3				base-sys-shlib		compatfile,ctf
 ./usr/lib/libctf.so.3.0				base-sys-shlib		compatfile,ctf

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2133 src/distrib/sets/lists/comp/mi:1.2134
--- src/distrib/sets/lists/comp/mi:1.2133	Fri May 19 00:01:33 2017
+++ src/distrib/sets/lists/comp/mi	Sun May 21 14:20:44 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2133 2017/05/19 00:01:33 pgoyette Exp $
+#	$NetBSD: mi,v 1.2134 2017/05/21 14:20:44 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -3211,8 +3211,8 @@
 ./usr/lib/libcrypto_mdc2.a			comp-obsolete		obsolete
 ./usr/lib/libcrypto_mdc2_p.a			comp-obsolete		obsolete
 ./usr/lib/libcrypto_p.a				comp-c-proflib		compatfile,crypto,profile
-./usr/lib/libcrypto_rc5.a			comp-c-lib		compatfile,crypto_rc5
-./usr/lib/libcrypto_rc5_p.a			comp-c-proflib		compatfile,crypto_rc5,profile
+./usr/lib/libcrypto_rc5.a			comp-obsolete		obsolete
+./usr/lib/libcrypto_rc5_p.a			comp-obsolete		obsolete
 ./usr/lib/libctf.a				comp-c-lib		compatfile,ctf
 ./usr/lib/libctf_p.a				comp-c-proflib		compatfile,ctf,profile
 ./usr/lib/libcurses.a				comp-c-lib		compatfile
@@ -3694,7 +3694,7 @@
 ./usr/libdata/lint/llib-lcrypto.ln		comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-lcrypto_idea.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lcrypto_mdc2.ln		comp-obsolete		obsolete
-./usr/libdata/lint/llib-lcrypto_rc5.ln		comp-c-lintlib		lint,crypto_rc5
+./usr/libdata/lint/llib-lcrypto_rc5.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lctf.ln			comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lcurses.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-ldes.ln			comp-c-lintlib		lint,crypto

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.303 src/distrib/sets/lists/comp/shl.mi:1.304
--- src/distrib/sets/lists/comp/shl.mi:1.303	Mon Apr 17 08:59:37 2017
+++ src/distrib/sets/lists/comp/shl.mi	Sun May 21 14:20:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.303 2017/04/17 08:59:37 riastradh Exp $
+# $NetBSD: shl.mi,v 1.304 2017/05/21 14:20:44 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -26,7 +26,7 @@
 ./usr/lib/libcompat_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libcrypt_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libcrypto_pic.a			comp-c-piclib		compatfile,picinstall,crypto
-./usr/lib/libcrypto_rc5_pic.a			comp-c-piclib		compatfile,picinstall,crypto,crypto_rc5
+./usr/lib/libcrypto_rc5_pic.a			comp-obsolete		obsolete
 ./usr/lib/libctf_pic.a				comp-c-piclib		compatfile,picinstall,ctf
 ./usr/lib/libcurses_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libdes_pic.a				comp-c-piclib		compatfile,picinstall,crypto

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.208 src/distrib/sets/lists/debug/mi:1.209
--- src/distrib/sets/lists/debug/mi:1.208	Mon Apr 17 09:06:55 2017
+++ src/distrib/sets/lists/debug/mi	Sun May 21 14:20:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.208 2017/04/17 09:06:55 knakahara Exp $
+# $NetBSD: mi,v 1.209 2017/05/21 14:20:44 riastradh Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib					comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -45,7 +45,7 @@
 ./usr/lib/libcrypto_g.a				comp-c-debuglib		debuglib,crypto,compatfile
 ./usr/lib/libcrypto_idea_g.a			comp-obsolete		obsolete,compatfile
 ./usr/lib/libcrypto_mdc2_g.a			comp-obsolete		obsolete,compatfile
-./usr/lib/libcrypto_rc5_g.a			comp-c-debuglib		debuglib,crypto_rc5,compatfile
+./usr/lib/libcrypto_rc5_g.a			comp-obsolete		debuglib,compatfile
 ./usr/lib/libctf_g.a				comp-c-debuglib		debuglib,compatfile,ctf
 ./usr/lib/libcurses_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libdes_g.a				comp-c-debuglib		debuglib,crypto,compatfile
@@ -1577,7 +1577,7 @@
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_randtest.debug		tests-crypto-debug	debug,atf,crypto,compattestfile
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc2test.debug		tests-crypto-debug	debug,atf,crypto,compattestfile
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc4test.debug		tests-crypto-debug	debug,atf,crypto,compattestfile
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc5test.debug		tests-crypto-debug	debug,atf,crypto_rc5,crypto,compattestfile
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc5test.debug		tests-crypto-debug	debug,atf,crypto,compattestfile
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ripemdtest.debug	tests-crypto-debug	debug,atf,crypto,compattestfile
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rsatest.debug		tests-crypto-debug	debug,atf,crypto,compattestfile
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_sha1test.debug		tests-crypto-debug	debug,atf,crypto,compattestfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.173 src/distrib/sets/lists/debug/shl.mi:1.174
--- src/distrib/sets/lists/debug/shl.mi:1.173	Sat May 13 21:27:11 2017
+++ src/distrib/sets/lists/debug/shl.mi	Sun May 21 14:20:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.173 2017/05/13 21:27:11 htodd Exp $
+# $NetBSD: shl.mi,v 1.174 2017/05/21 14:20:44 riastradh Exp $
 ./usr/lib/libbfd_g.a						comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib						base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
@@ -76,7 +76,7 @@
 ./usr/libdata/debug/usr/lib/libcrypto.so.12.0.debug		comp-crypto-debug	debug,compatfile,crypto
 ./usr/libdata/debug/usr/lib/libcrypto_idea.so.7.0.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libcrypto_mdc2.so.7.0.debug		comp-obsolete	debug,compatfile,obsolete
-./usr/libdata/debug/usr/lib/libcrypto_rc5.so.12.0.debug		comp-crypto-debug	debug,compatfile,crypto,crypto_rc5
+./usr/libdata/debug/usr/lib/libcrypto_rc5.so.12.0.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libctf.so.3.0.debug			comp-sys-debug	debug,compatfile,ctf
 ./usr/libdata/debug/usr/lib/libcurses.so.7.0.debug		comp-obsolete	debug,obsolete,compatfile
 ./usr/libdata/debug/usr/lib/libcurses.so.7.1.debug		comp-sys-debug	debug,compatfile

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.744 src/distrib/sets/lists/tests/mi:1.745
--- src/distrib/sets/lists/tests/mi:1.744	Sat May 20 16:35:55 2017
+++ src/distrib/sets/lists/tests/mi	Sun May 21 14:20:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.744 2017/05/20 16:35:55 kre Exp $
+# $NetBSD: mi,v 1.745 2017/05/21 14:20:45 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1326,7 +1326,7 @@
 ./usr/tests/crypto/libcrypto/h_randtest		tests-crypto-tests	compattestfile,atf,crypto
 ./usr/tests/crypto/libcrypto/h_rc2test		tests-crypto-tests	compattestfile,atf,crypto
 ./usr/tests/crypto/libcrypto/h_rc4test		tests-crypto-tests	compattestfile,atf,crypto
-./usr/tests/crypto/libcrypto/h_rc5test		tests-crypto-tests	compattestfile,atf,crypto,crypto_rc5
+./usr/tests/crypto/libcrypto/h_rc5test		tests-crypto-tests	compattestfile,atf,crypto
 ./usr/tests/crypto/libcrypto/h_ripemdtest	tests-crypto-tests	compattestfile,atf,crypto
 ./usr/tests/crypto/libcrypto/h_rsatest		tests-crypto-tests	compattestfile,atf,crypto
 ./usr/tests/crypto/libcrypto/h_sha1test		tests-crypto-tests	compattestfile,atf,crypto

Index: src/share/man/man3/intro.3
diff -u src/share/man/man3/intro.3:1.31 src/share/man/man3/intro.3:1.32
--- src/share/man/man3/intro.3:1.31	Sun Nov 22 09:37:33 2015
+++ src/share/man/man3/intro.3	Sun May 21 14:20:45 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: intro.3,v 1.31 2015/11/22 09:37:33 wiz Exp $
+.\"	$NetBSD: intro.3,v 1.32 2017/05/21 14:20:45 riastradh Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -129,10 +129,6 @@ See
 The OpenSSL cryptographic library routines for the IDEA algorithm.
 This algorithm is separated from libcrypto since the IDEA algorithm is
 protected by patents and its use is restricted.
-.It Em libcrypto_rc5 Pq Fl l Ns Ar crypto_rc5
-The OpenSSL cryptographic library routines for the RC5 algorithm.
-This algorithm is separated from libcrypto since the RC5 algorithm is
-protected by patents and its use is restricted.
 .It Em libcurses Pq Fl l Ns Ar curses Fl l Ns Ar terminfo
 Terminal independent screen management routines
 for two dimensional non-bitmap display terminals.

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.74 src/share/man/man5/mk.conf.5:1.75
--- src/share/man/man5/mk.conf.5:1.74	Thu Apr 20 09:48:55 2017
+++ src/share/man/man5/mk.conf.5	Sun May 21 14:20:45 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.74 2017/04/20 09:48:55 wiz Exp $
+.\"	$NetBSD: mk.conf.5,v 1.75 2017/05/21 14:20:45 riastradh Exp $
 .\"
 .\"  Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -346,12 +346,6 @@ If
 acts as
 .Sy MKKERBEROS=no .
 .
-.It Sy MKCRYPTO_RC5
-.YorN
-Indicates whether RC5 support will be built into
-.Sy libcrypto_rc5.a .
-.DFLTn
-.
 .It Sy MKCVS
 .YorN
 Indicates whether

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.359 src/share/mk/bsd.README:1.360
--- src/share/mk/bsd.README:1.359	Thu Apr 20 09:29:10 2017
+++ src/share/mk/bsd.README	Sun May 21 14:20:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.359 2017/04/20 09:29:10 ozaki-r Exp $
+#	$NetBSD: bsd.README,v 1.360 2017/05/21 14:20:45 riastradh Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -151,9 +151,6 @@ MKCRYPTO	If "no", no cryptography suppor
 		and also acts as "MKKERBEROS=no".
 		Default: yes
 
-MKCRYPTO_RC5	If not "no", RC5 support will be built into libcrypto_rc5
-		Default: no
-
 MKCTF		If "no", do not build and install CTF tools, and also
 		don't generate and manipulate CTF data of ELF binaries
 		during build.
@@ -1568,7 +1565,6 @@ DPADD		Additional dependencies for the p
 		LIBCRYPTO?=	${DESTDIR}/usr/lib/libcrypto.a
 		LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a
 		LIBCRYPTO_MDC2?=${DESTDIR}/usr/lib/libcrypto_mdc2.a
-		LIBCRYPTO_RC5?=	${DESTDIR}/usr/lib/libcrypto_rc5.a
 		LIBCURSES?=	${DESTDIR}/usr/lib/libcurses.a
 		LIBC_PIC?=	${DESTDIR}/usr/lib/libc_pic.a
 		LIBDBM?=	${DESTDIR}/usr/lib/libdbm.a

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1007 src/share/mk/bsd.own.mk:1.1008
--- src/share/mk/bsd.own.mk:1.1007	Wed Mar 22 23:11:09 2017
+++ src/share/mk/bsd.own.mk	Sun May 21 14:20:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1007 2017/03/22 23:11:09 chs Exp $
+#	$NetBSD: bsd.own.mk,v 1.1008 2017/05/21 14:20:45 riastradh Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1104,7 +1104,7 @@ MKARZERO ?= ${MKREPRO}
 _MKVARS.no= \
 	MKARZERO \
 	MKBSDGREP MKBSDTAR \
-	MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCRYPTO_RC5 MKCTF \
+	MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCTF \
 	MKDEBUG MKDEBUGLIB MKDTRACE \
 	MKEXTSRC \
 	MKGROFFHTMLDOC \

Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.304 src/share/mk/bsd.prog.mk:1.305
--- src/share/mk/bsd.prog.mk:1.304	Wed Apr 19 23:41:00 2017
+++ src/share/mk/bsd.prog.mk	Sun May 21 14:20:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.304 2017/04/19 23:41:00 joerg Exp $
+#	$NetBSD: bsd.prog.mk,v 1.305 2017/05/21 14:20:45 riastradh Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -116,7 +116,6 @@ LIBCRTI=	${DESTDIR}/usr/lib/${MLIBDIR:D$
 	crypto \
 	crypto_idea \
 	crypto_mdc2 \
-	crypto_rc5 \
 	curses \
 	cxx \
 	dbm \

Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.9 src/tests/crypto/libcrypto/Makefile:1.10
--- src/tests/crypto/libcrypto/Makefile:1.9	Sat Jul 14 04:06:17 2012
+++ src/tests/crypto/libcrypto/Makefile	Sun May 21 14:20:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/07/14 04:06:17 christos Exp $
+# $NetBSD: Makefile,v 1.10 2017/05/21 14:20:45 riastradh Exp $
 
 .include <bsd.own.mk>
 
@@ -8,10 +8,7 @@ SUBDIR+=bf bn cast conf des dh dsa ec ec
 	md2 md4 md5 rand rc2 rc4 ripemd rsa sha sha1 srp threads x509v3
 
 SUBDIR+=idea mdc2
-
-.if ${MKCRYPTO_RC5} != "no"
 SUBDIR+=rc5
-.endif
 
 TESTSDIR=	${TESTSBASE}/crypto/libcrypto
 

Index: src/tests/crypto/libcrypto/t_ciphers.sh
diff -u src/tests/crypto/libcrypto/t_ciphers.sh:1.4 src/tests/crypto/libcrypto/t_ciphers.sh:1.5
--- src/tests/crypto/libcrypto/t_ciphers.sh:1.4	Sat Jul 14 16:04:06 2012
+++ src/tests/crypto/libcrypto/t_ciphers.sh	Sun May 21 14:20:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_ciphers.sh,v 1.4 2012/07/14 16:04:06 spz Exp $
+# $NetBSD: t_ciphers.sh,v 1.5 2017/05/21 14:20:45 riastradh Exp $
 #
 # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -103,9 +103,6 @@ rc5_head()
 }
 rc5_body()
 {
-	[ -x "$(atf_get_srcdir)/h_rc5test" ] \
-	    || atf_skip "RC5 support not available; system built" \
-	                "with MKCRYPTO_RC5=no"
 	atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_rc5test"
 }
 

Index: src/tests/crypto/libcrypto/rc5/Makefile
diff -u src/tests/crypto/libcrypto/rc5/Makefile:1.3 src/tests/crypto/libcrypto/rc5/Makefile:1.4
--- src/tests/crypto/libcrypto/rc5/Makefile:1.3	Tue Jul  5 10:03:10 2011
+++ src/tests/crypto/libcrypto/rc5/Makefile	Sun May 21 14:20:45 2017
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/07/05 10:03:10 spz Exp $
+# $NetBSD: Makefile,v 1.4 2017/05/21 14:20:45 riastradh Exp $
 
 HELPER_NAME=	rc5test
 HELPER_DIR=	rc5
 
 .include <bsd.init.mk>
 
-.if ${MKCRYPTO_RC5} != "no"
-LDADD= -lcrypto_rc5 -lcrypto
-.else
-CPPFLAGS+= -DOPENSSL_NO_RC5
-.endif
-
+LDADD= -lcrypto
 LDADD+=		-Wl,--no-fatal-warnings

Index: src/usr.sbin/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.29 src/usr.sbin/racoon/Makefile:1.30
--- src/usr.sbin/racoon/Makefile:1.29	Wed Feb 22 12:17:16 2017
+++ src/usr.sbin/racoon/Makefile	Sun May 21 14:20:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/02/22 12:17:16 maya Exp $
+# $NetBSD: Makefile,v 1.30 2017/05/21 14:20:45 riastradh Exp $
 
 WARNS?=	0	# XXX third-party program, many issues
 NOCLANGERROR=	# defined
@@ -52,11 +52,7 @@ DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX5
 	${LIBROKEN} ${LIBASN1} ${LIBSQLITE3}
 .endif
 CPPFLAGS+=-DHAVE_OPENSSL_IDEA_H
-.if (${MKCRYPTO_RC5} != "no")
 CPPFLAGS+=-DHAVE_OPENSSL_RC5_H
-LDADD+= -lcrypto_rc5
-LDADD+= ${LIBCRYPTO_RC5}
-.endif
 .if (${USE_INET6} != "no")
 CPPFLAGS+=-DINET6
 .endif

Reply via email to