Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always compile RSA into libcrypto. 

MKCRYPTO disables the whole crypto tree, and in that case,
we will not have RSA (nor libcrypto) with us.
This commit is contained in:
itojun 2000-09-30 12:21:51 +00:00
parent 28d5cf3074
commit e5e807d114
4 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/Makefile.openssl
View File

@ -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 .ifndef _MAKEFILE_OPENSSL_INCLUDED
_MAKEFILE_OPENSSL_INCLUDED=1 _MAKEFILE_OPENSSL_INCLUDED=1
@ -8,8 +8,4 @@ _MAKEFILE_OPENSSL_INCLUDED=1
OPENSSLSRC= ${CRYPTODIST}/openssl OPENSSLSRC= ${CRYPTODIST}/openssl
CPPFLAGS+= -DOPENSSLDIR=\"/etc/openssl\" CPPFLAGS+= -DOPENSSLDIR=\"/etc/openssl\"
.if (${MKCRYPTO_RSA} == "no")
CPPFLAGS+= -DNO_RSA
.endif
.endif .endif

12
lib/libcrypto/srcs.inc
View File

@ -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 \ 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 \ cast.inc comp.inc conf.inc des.inc dh.inc dsa.inc \
err.inc evp.inc hmac.inc lhash.inc md2.inc mdc2.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 \ 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 \ rc4.inc md5.inc ripemd.inc rsa.inc sha.inc stack.inc \
x509.inc x509v3.inc txt_db.inc x509.inc x509v3.inc
.if (${MKCRYPTO_RSA} != "no")
CRYPTOINCS+= rsa.inc
.endif
# patented algorithms - see ../libcrypto_*
CRYPTOINCS+= idea.inc CRYPTOINCS+= idea.inc
CRYPTOINCS+= rc5.inc CRYPTOINCS+= rc5.inc
.for cryptoinc in ${CRYPTOINCS} .for cryptoinc in ${CRYPTOINCS}

9
share/mk/bsd.README
View File

@ -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 # @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the new make "include" files for the BSD 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". NOCRYPTO If set, it is equivalent to setting MKCRYPTO to "no".
MKCRYPTO_RSA If set to "no", RSA support will not be built into MKCRYPTO_RSA Obsoleted; no effect. RSA functions are always built
the system's cryptography libraries. This implies (as long as MKCRYPTO is set to "yes").
that SSLv2 support will not be present. Defaults 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 MKCRYPTO_IDEA If set to "yes", IDEA support will be built into
libcrypto_idea.a. Defaults to "no". libcrypto_idea.a. Defaults to "no".

8
share/mk/bsd.own.mk
View File

@ -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_) .if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1 _BSD_OWN_MK_=1
@ -266,12 +266,6 @@ MKCRYPTO=no
MKCRYPTO?=yes MKCRYPTO?=yes
.endif .endif
.if defined(NOCRYPTO_RSA)
MKCRYPTO_RSA=no
.else
MKCRYPTO_RSA?=yes
.endif
MKCRYPTO_IDEA?=no MKCRYPTO_IDEA?=no
MKCRYPTO_RC5?=no MKCRYPTO_RC5?=no