Module Name: src
Committed By: christos
Date: Wed Jul 11 18:48:28 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: idea.inc mdc2.inc
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto: i_cbc_dummy.c
i_skey_dummy.c mdc2dgst_dummy.c
Log Message:
Enable ciphers with expired patents:
mdc2 4,908,861 (expired August 28, 2007)
idea 5,214,703 (expired January 7, 2012)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/i_cbc_dummy.c \
src/crypto/external/bsd/openssl/lib/libcrypto/i_skey_dummy.c \
src/crypto/external/bsd/openssl/lib/libcrypto/mdc2dgst_dummy.c
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc
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.1 src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc:1.1 Sun Jul 19 19:30:43 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/idea.inc Wed Jul 11 14:48:27 2012
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc:1.1 Sun Jul 19 19:30:44 2009
+++ src/crypto/external/bsd/openssl/lib/libcrypto/mdc2.inc Wed Jul 11 14:48:27 2012
@@ -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
