Module Name: src
Committed By: riastradh
Date: Sun May 21 14:24:05 UTC 2017
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: idea.inc mdc2.inc
src/share/man/man3: intro.3
src/share/mk: bsd.README bsd.prog.mk
Log Message:
Remove some vestiges of MKCRYPTO_IDEA/MKCRYPTO_MDC2.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc
cvs rdiff -u -r1.32 -r1.33 src/share/man/man3/intro.3
cvs rdiff -u -r1.360 -r1.361 src/share/mk/bsd.README
cvs rdiff -u -r1.305 -r1.306 src/share/mk/bsd.prog.mk
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/lib/libcrypto/idea.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc:1.3 Thu Jul 12 18:44:49 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc Sun May 21 14:24:05 2017
@@ -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}
Index: src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc:1.3 Thu Jul 12 18:44:49 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc Sun May 21 14:24:05 2017
@@ -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}
Index: src/share/man/man3/intro.3
diff -u src/share/man/man3/intro.3:1.32 src/share/man/man3/intro.3:1.33
--- src/share/man/man3/intro.3:1.32 Sun May 21 14:20:45 2017
+++ src/share/man/man3/intro.3 Sun May 21 14:24:05 2017
@@ -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.
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.360 src/share/mk/bsd.README:1.361
--- src/share/mk/bsd.README:1.360 Sun May 21 14:20:45 2017
+++ src/share/mk/bsd.README Sun May 21 14:24:05 2017
@@ -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 p
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
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.305 src/share/mk/bsd.prog.mk:1.306
--- src/share/mk/bsd.prog.mk:1.305 Sun May 21 14:20:45 2017
+++ src/share/mk/bsd.prog.mk Sun May 21 14:24:05 2017
@@ -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$
compat \
crypt \
crypto \
- crypto_idea \
- crypto_mdc2 \
curses \
cxx \
dbm \
