[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto Enable ciphers wit...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto Enable ciphers wit...
From: christos <christos%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 23:25:12 +0000
details:   https://anonhg.NetBSD.org/src/rev/310a11ebc9a3
branches:  trunk
changeset: 780086:310a11ebc9a3
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jul 11 18:48:27 2012 +0000

description:
Enable ciphers with expired patents:
mdc2 4,908,861 (expired August 28, 2007)
idea 5,214,703 (expired January 7, 2012)

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c    |   96 -----------
 crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c   |   95 -----------
 crypto/external/bsd/openssl/lib/libcrypto/idea.inc         |    6 +-
 crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc         |    6 +-
 crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c |  109 -------------
 5 files changed, 4 insertions(+), 308 deletions(-)

diffs (truncated from 352 to 300 lines):

diff -r 558b1b0d8d48 -r 310a11ebc9a3 crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c
--- a/crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c   Wed Jul 11 18:33:14 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/* crypto/idea/i_cbc.c */
-/* Copyright (C) 1995-1998 Eric Young (eay%cryptsoft.com@localhost)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay%cryptsoft.com@localhost).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh%cryptsoft.com@localhost).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay%cryptsoft.com@localhost)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh%cryptsoft.com@localhost)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <openssl/idea.h>
-#include "idea_lcl.h"
-
-#include <sys/cdefs.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-#define idea_cbc_encrypt       _idea_cbc_encrypt
-#define idea_encrypt           _idea_encrypt
-
-__weak_alias(idea_cbc_encrypt,_idea_cbc_encrypt)
-__weak_alias(idea_encrypt,_idea_encrypt)
-#endif
-
-__warn_references(idea_cbc_encrypt,
-    "IDEA is a patented algorithm; link against libcrypto_idea")
-__warn_references(idea_encrypt,
-    "IDEA is a patented algorithm; link against libcrypto_idea")
-
-void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-            IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int encrypt)
-{
-
-       fprintf(stderr,
-           "IDEA is a patented algorithm; link against libcrypto_idea. "
-           "Exiting...\n");
-       exit(1);
-}
-
-void idea_encrypt(IDEA_INT *d, IDEA_KEY_SCHEDULE *key)
-{
-
-       fprintf(stderr,
-           "IDEA is a patented algorithm; link against libcrypto_idea. "
-           "Exiting...\n");
-       exit(1);
-}
diff -r 558b1b0d8d48 -r 310a11ebc9a3 crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c
--- a/crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c  Wed Jul 11 18:33:14 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/* crypto/idea/i_skey.c */
-/* Copyright (C) 1995-1998 Eric Young (eay%cryptsoft.com@localhost)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay%cryptsoft.com@localhost).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh%cryptsoft.com@localhost).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay%cryptsoft.com@localhost)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh%cryptsoft.com@localhost)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <openssl/idea.h>
-#include "idea_lcl.h"
-
-#include <sys/cdefs.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef __weak_alias
-#define idea_set_encrypt_key   _idea_set_encrypt_key
-#define idea_set_decrypt_key   _idea_set_decrypt_key
-
-__weak_alias(idea_set_encrypt_key,_idea_set_encrypt_key)
-__weak_alias(idea_set_decrypt_key,_idea_set_decrypt_key)
-#endif
-
-__warn_references(idea_set_encrypt_key,
-    "IDEA is a patented algorithm; link against libcrypto_idea")
-__warn_references(idea_set_decrypt_key,
-    "IDEA is a patented algorithm; link against libcrypto_idea")
-
-void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
-{
-
-       fprintf(stderr,
-           "IDEA is a patented algorithm; link against libcrypto_idea. "
-           "Exiting...\n");
-       exit(1);
-}
-
-void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
-{
-
-       fprintf(stderr,
-           "IDEA is a patented algorithm; link against libcrypto_idea. "
-           "Exiting...\n");
-       exit(1);
-}
diff -r 558b1b0d8d48 -r 310a11ebc9a3 crypto/external/bsd/openssl/lib/libcrypto/idea.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/idea.inc        Wed Jul 11 18:33:14 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/idea.inc        Wed Jul 11 18:48:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: idea.inc,v 1.1 2009/07/19 23:30:43 christos Exp $
+#      $NetBSD: idea.inc,v 1.2 2012/07/11 18:48:27 christos Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -11,9 +11,7 @@
 IDEA_SRCS = i_cfb64.c i_ofb64.c i_ecb.c
 # IDEA is a patented algorithm; abort().
 # see ../libcrypto_idea
-IDEA_SRCS += i_cbc_dummy.c i_skey_dummy.c
-#SRCS+=i_cbc.c i_skey.c
-SRCS += ${IDEA_SRCS}
+SRCS+=i_cbc.c i_skey.c
 
 .for cryptosrc in ${IDEA_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/idea
diff -r 558b1b0d8d48 -r 310a11ebc9a3 crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc
--- a/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc        Wed Jul 11 18:33:14 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc        Wed Jul 11 18:48:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mdc2.inc,v 1.1 2009/07/19 23:30:44 christos Exp $
+#      $NetBSD: mdc2.inc,v 1.2 2012/07/11 18:48:27 christos Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -11,9 +11,7 @@
 MDC2_SRCS = mdc2_one.c
 # MDC2 is a patented algorithm; abort().
 # see ../libcrypto_mdc2
-MDC2_SRCS += mdc2dgst_dummy.c
-#SRCS+=        mdc2dgst.c
-SRCS += ${MDC2_SRCS}
+SRCS+= mdc2dgst.c
 
 .for cryptosrc in ${MDC2_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/mdc2
diff -r 558b1b0d8d48 -r 310a11ebc9a3 crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c
--- a/crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c        Wed Jul 11 18:33:14 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/* crypto/mdc2/mdc2dgst.c */
-/* Copyright (C) 1995-1998 Eric Young (eay%cryptsoft.com@localhost)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay%cryptsoft.com@localhost).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh%cryptsoft.com@localhost).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay%cryptsoft.com@localhost)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh%cryptsoft.com@localhost)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
Prev by Date: [src/trunk]: src/crypto/external/bsd/openssl/lib remove unneeded libraries
Next by Date: [src/trunk]: src/doc Fill in homepage for file(1). From Bug Hunting.
Previous by Thread: [src/trunk]: src/crypto/external/bsd/openssl/lib remove unneeded libraries
Next by Thread: [src/trunk]: src/doc Fill in homepage for file(1). From Bug Hunting.
Indexes:
Home | Main Index | Thread Index | Old Index