From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Wed, 3 Aug 2016 19:05:00 +0000 (-0700)
Subject: Add IDEA support for libcrypto(3).
X-Git-Tag: v4.8.0rc~1283
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/cb698b8d44ed60e0d61817dd229b55039d876be6

Add IDEA support for libcrypto(3).

The patent expired years ago.
---

diff --git a/crypto/openssl/README.DRAGONFLY b/crypto/openssl/README.DRAGONFLY
index eb26e2c97e..12a18d5074 100644
--- a/crypto/openssl/README.DRAGONFLY
+++ b/crypto/openssl/README.DRAGONFLY
@@ -2,7 +2,7 @@ Original source can be downloaded from OpenSSL at
 <http://www.openssl.org/source/>.
 
 Here's some hints to upgrading:
-./Configure shared no-idea --prefix=/usr --openssldir=/etc/ssl BSD-x86_64
+./Configure shared --prefix=/usr --openssldir=/etc/ssl BSD-x86_64
 cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-x86_64.h
 cd ../../secure/lib/libcrypto
 # Update the version and date in Makefile.inc
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index ada4968523..408bf73e6f 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -123,17 +123,6 @@ THREAD_LIB?=	thread_xu
 # The list of modules to build instead of all of them.
 #MODULES_OVERRIDE=	emulation/linux net/ipfw
 #
-# The following controls building optional IDEA code in libcrypto.
-# Patents are involved - you must not use this unless
-# you either have a license or fall within patent 'fair use'
-# provisions.
-#
-# *** It is YOUR RESPONSIBILITY to determine if you can use this! ***
-#
-# IDEA is patented in the USA and many European countries - thought to
-# be OK to use for any non-commercial use.  This is optional.
-#WANT_IDEA=	YES	# IDEA (128 bit symmetric encryption)
-#
 # The paper size for groff(1), either "letter" or "A4"
 #GROFF_PAPER_SIZE=	letter
 #
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 354e7a4e4e..e93c0e6d6d 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -6,7 +6,3 @@ CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt/obj
 .else
 CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt
 .endif
-
-.if !defined(WANT_IDEA)
-CFLAGS+= -DNO_IDEA
-.endif
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 6eba835596..f211c17932 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -35,11 +35,7 @@ buildinf.h:
 	echo "#endif" ) > ${.TARGET}
 
 opensslconf.h: opensslconf-${MACHINE_ARCH}.h
-.if defined(WANT_IDEA)
-	sed '/^# define OPENSSL_NO_IDEA$$/d;/^#  define NO_IDEA$$/d' ${.ALLSRC} > ${.TARGET}
-.else
 	cp ${.ALLSRC} ${.TARGET}
-.endif
 
 
 # aes
@@ -194,11 +190,8 @@ SRCS+=	hmac.c hm_ameth.c hm_pmeth.c
 INCS+=	hmac.h
 
 # idea
-.if defined(WANT_IDEA)
 SRCS+=	i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c
 INCS+=	idea.h
-_ideapath=	${LCRYPTO_SRC}/crypto/idea
-.endif
 
 # krb5
 SRCS+=	krb5_asn.c
@@ -368,6 +361,7 @@ INCS+=	x509v3.h
 	${LCRYPTO_SRC}/crypto/aes \
 	${LCRYPTO_SRC}/crypto/rc2 \
 	${LCRYPTO_SRC}/crypto/rc4 \
+	${LCRYPTO_SRC}/crypto/idea \
 	${LCRYPTO_SRC}/crypto/bf \
 	${LCRYPTO_SRC}/crypto/cast \
 	${LCRYPTO_SRC}/crypto/camellia \
@@ -407,6 +401,5 @@ INCS+=	x509v3.h
 	${LCRYPTO_SRC}/crypto/ts \
 	${LCRYPTO_SRC}/crypto/srp \
 	${LCRYPTO_SRC}/crypto/cmac \
-	${_ideapath} \
 	${LCRYPTO_SRC} \
 	${.CURDIR}/man
diff --git a/secure/lib/libcrypto/opensslconf-x86_64.h b/secure/lib/libcrypto/opensslconf-x86_64.h
index 079cbfb330..f7b46b9de8 100644
--- a/secure/lib/libcrypto/opensslconf-x86_64.h
+++ b/secure/lib/libcrypto/opensslconf-x86_64.h
@@ -14,9 +14,6 @@ extern "C" {
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
 #endif
-#ifndef OPENSSL_NO_IDEA
-# define OPENSSL_NO_IDEA
-#endif
 #ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
 #endif
@@ -74,9 +71,6 @@ extern "C" {
 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
 #  define NO_GMP
 # endif
-# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
-#  define NO_IDEA
-# endif
 # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
 #  define NO_JPAKE
 # endif
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 346ee56321..74c6eb5f9c 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $
 .\"
-.Dd October 28, 2015
+.Dd August 3, 2016
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -509,13 +509,6 @@ or
 to configure the system's default threading library.
 The default is
 .Li thread_xu .
-.It Va WANT_IDEA
-.Pq Vt bool
-Set to build the IDEA encryption code.
-This code is patented in the USA and many European countries.
-It is
-.Em "YOUR RESPONSIBILITY"
-to determine if you can legally use IDEA.
 .It Va WANT_INSTALLER
 .Pq Vt bool
 Set to build the installer.