diff --git a/crypto/external/bsd/openssl/lib/libcrypto/idea.inc b/crypto/external/bsd/openssl/lib/libcrypto/idea.inc index 5b6130286664..ff885ff1b681 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/idea.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/idea.inc @@ -1,4 +1,4 @@ -# $NetBSD: idea.inc,v 1.3 2012/07/12 18:44:49 christos Exp $ +# $NetBSD: idea.inc,v 1.4 2017/05/21 14:24:05 riastradh Exp $ # # @(#) Copyright (c) 1995 Simon J. Gerraty # @@ -9,8 +9,6 @@ IDEA_SRCS = i_cfb64.c i_ofb64.c i_ecb.c -# IDEA is a patented algorithm; abort(). -# see ../libcrypto_idea SRCS+=${IDEA_SRCS} i_cbc.c i_skey.c .for cryptosrc in ${IDEA_SRCS} diff --git a/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc b/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc index d846e1edab46..f4d14fa5652d 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc +++ b/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc @@ -1,4 +1,4 @@ -# $NetBSD: mdc2.inc,v 1.3 2012/07/12 18:44:49 christos Exp $ +# $NetBSD: mdc2.inc,v 1.4 2017/05/21 14:24:05 riastradh Exp $ # # @(#) Copyright (c) 1995 Simon J. Gerraty # @@ -9,8 +9,6 @@ MDC2_SRCS = mdc2_one.c -# MDC2 is a patented algorithm; abort(). -# see ../libcrypto_mdc2 SRCS+= ${MDC2_SRCS} mdc2dgst.c .for cryptosrc in ${MDC2_SRCS} diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3 index 67cc2523289f..0c95073ab08b 100644 --- a/share/man/man3/intro.3 +++ b/share/man/man3/intro.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.3,v 1.32 2017/05/21 14:20:45 riastradh Exp $ +.\" $NetBSD: intro.3,v 1.33 2017/05/21 14:24:05 riastradh Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -125,10 +125,6 @@ See The OpenSSL cryptographic library. See .Xr crypto 3 . -.It Em libcrypto_idea Pq Fl l Ns Ar crypto_idea -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 libcurses Pq Fl l Ns Ar curses Fl l Ns Ar terminfo Terminal independent screen management routines for two dimensional non-bitmap display terminals. diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 61202a69ffca..221e457cccce 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.360 2017/05/21 14:20:45 riastradh Exp $ +# $NetBSD: bsd.README,v 1.361 2017/05/21 14:24:05 riastradh Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -1563,8 +1563,6 @@ DPADD Additional dependencies for the program. Usually used for LIBCRTI?= ${DESTDIR}/usr/lib/crti.o LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a - LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a - LIBCRYPTO_MDC2?=${DESTDIR}/usr/lib/libcrypto_mdc2.a LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 691b15b8327f..f601a814256a 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.305 2017/05/21 14:20:45 riastradh Exp $ +# $NetBSD: bsd.prog.mk,v 1.306 2017/05/21 14:24:05 riastradh Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -114,8 +114,6 @@ LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o compat \ crypt \ crypto \ - crypto_idea \ - crypto_mdc2 \ curses \ cxx \ dbm \