Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove some vestiges of MKCRYPTO_IDEA/MKCRYPTO_MDC2.



details:   https://anonhg.NetBSD.org/src/rev/e183e43f8691
branches:  trunk
changeset: 824060:e183e43f8691
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun May 21 14:24:05 2017 +0000

description:
Remove some vestiges of MKCRYPTO_IDEA/MKCRYPTO_MDC2.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/idea.inc |  4 +---
 crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc |  4 +---
 share/man/man3/intro.3                             |  6 +-----
 share/mk/bsd.README                                |  4 +---
 share/mk/bsd.prog.mk                               |  4 +---
 5 files changed, 5 insertions(+), 17 deletions(-)

diffs (92 lines):

diff -r 95af6409995f -r e183e43f8691 crypto/external/bsd/openssl/lib/libcrypto/idea.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/idea.inc        Sun May 21 14:20:44 2017 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/idea.inc        Sun May 21 14:24:05 2017 +0000
@@ -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 -r 95af6409995f -r e183e43f8691 crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc        Sun May 21 14:20:44 2017 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc        Sun May 21 14:24:05 2017 +0000
@@ -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 -r 95af6409995f -r e183e43f8691 share/man/man3/intro.3
--- a/share/man/man3/intro.3    Sun May 21 14:20:44 2017 +0000
+++ b/share/man/man3/intro.3    Sun May 21 14:24:05 2017 +0000
@@ -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 @@
 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 -r 95af6409995f -r e183e43f8691 share/mk/bsd.README
--- a/share/mk/bsd.README       Sun May 21 14:20:44 2017 +0000
+++ b/share/mk/bsd.README       Sun May 21 14:24:05 2017 +0000
@@ -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 @@
                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 -r 95af6409995f -r e183e43f8691 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Sun May 21 14:20:44 2017 +0000
+++ b/share/mk/bsd.prog.mk      Sun May 21 14:24:05 2017 +0000
@@ -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 @@
        compat \
        crypt \
        crypto \
-       crypto_idea \
-       crypto_mdc2 \
        curses \
        cxx \
        dbm \



Home | Main Index | Thread Index | Old Index