From e5e807d114f63f38d8937aeb266ab7add732ef86 Mon Sep 17 00:00:00 2001 From: itojun Date: Sat, 30 Sep 2000 12:21:51 +0000 Subject: [PATCH] always compile RSA into libcrypto. MKCRYPTO disables the whole crypto tree, and in that case, we will not have RSA (nor libcrypto) with us. --- crypto/Makefile.openssl | 6 +----- lib/libcrypto/srcs.inc | 12 ++++-------- share/mk/bsd.README | 9 ++++----- share/mk/bsd.own.mk | 8 +------- 4 files changed, 10 insertions(+), 25 deletions(-) diff --git a/crypto/Makefile.openssl b/crypto/Makefile.openssl index 186107a02eb0..1865223b9b5c 100644 --- a/crypto/Makefile.openssl +++ b/crypto/Makefile.openssl @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.openssl,v 1.4 2000/09/30 00:30:25 itojun Exp $ +# $NetBSD: Makefile.openssl,v 1.5 2000/09/30 12:21:51 itojun Exp $ .ifndef _MAKEFILE_OPENSSL_INCLUDED _MAKEFILE_OPENSSL_INCLUDED=1 @@ -8,8 +8,4 @@ _MAKEFILE_OPENSSL_INCLUDED=1 OPENSSLSRC= ${CRYPTODIST}/openssl CPPFLAGS+= -DOPENSSLDIR=\"/etc/openssl\" -.if (${MKCRYPTO_RSA} == "no") -CPPFLAGS+= -DNO_RSA -.endif - .endif diff --git a/lib/libcrypto/srcs.inc b/lib/libcrypto/srcs.inc index 7c1fa36d9a5f..a31e0216e698 100644 --- a/lib/libcrypto/srcs.inc +++ b/lib/libcrypto/srcs.inc @@ -1,18 +1,14 @@ -# $NetBSD: srcs.inc,v 1.6 2000/09/30 00:23:37 itojun Exp $ +# $NetBSD: srcs.inc,v 1.7 2000/09/30 12:21:53 itojun Exp $ CRYPTOINCS= asn1.inc crypto.inc bf.inc bio.inc bn.inc buffer.inc \ cast.inc comp.inc conf.inc des.inc dh.inc dsa.inc \ err.inc evp.inc hmac.inc lhash.inc md2.inc mdc2.inc \ objects.inc pem.inc pkcs12.inc pkcs7.inc rand.inc rc2.inc \ - rc4.inc md5.inc ripemd.inc sha.inc stack.inc txt_db.inc \ - x509.inc x509v3.inc - -.if (${MKCRYPTO_RSA} != "no") -CRYPTOINCS+= rsa.inc -.endif + rc4.inc md5.inc ripemd.inc rsa.inc sha.inc stack.inc \ + txt_db.inc x509.inc x509v3.inc +# patented algorithms - see ../libcrypto_* CRYPTOINCS+= idea.inc - CRYPTOINCS+= rc5.inc .for cryptoinc in ${CRYPTOINCS} diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 8dde18ff4b07..0944964e7bb7 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.66 2000/09/30 00:23:37 itojun Exp $ +# $NetBSD: bsd.README,v 1.67 2000/09/30 12:21:52 itojun Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the new make "include" files for the BSD @@ -236,11 +236,10 @@ MKCRYPTO If set to "no", no cryptography support will be built NOCRYPTO If set, it is equivalent to setting MKCRYPTO to "no". -MKCRYPTO_RSA If set to "no", RSA support will not be built into - the system's cryptography libraries. This implies - that SSLv2 support will not be present. Defaults to "yes". +MKCRYPTO_RSA Obsoleted; no effect. RSA functions are always built + (as long as MKCRYPTO is set to "yes"). -NOCRYPTO_RSA If set, it is equivalent to setting MKCRYPTO_RSA to "no". +NOCRYPTO_RSA Obsoleted; no effect. MKCRYPTO_IDEA If set to "yes", IDEA support will be built into libcrypto_idea.a. Defaults to "no". diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 1af875577b18..585bad1b53c3 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.143 2000/09/30 00:23:37 itojun Exp $ +# $NetBSD: bsd.own.mk,v 1.144 2000/09/30 12:21:52 itojun Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 @@ -266,12 +266,6 @@ MKCRYPTO=no MKCRYPTO?=yes .endif -.if defined(NOCRYPTO_RSA) -MKCRYPTO_RSA=no -.else -MKCRYPTO_RSA?=yes -.endif - MKCRYPTO_IDEA?=no MKCRYPTO_RC5?=no