diff options
| author | markm <markm@FreeBSD.org> | 2000-06-24 06:50:58 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-06-24 06:50:58 +0000 |
| commit | 2fe0472e3949a7c045ea27f8f6b3652ae3aca5dc (patch) | |
| tree | 3ed0aa90949c0ec988e2973893cd6e9a75ea7506 /secure | |
| parent | f3680800aaed268ba8b95bbd5a8ea04ca9ec4cc4 (diff) | |
| download | FreeBSD-src-2fe0472e3949a7c045ea27f8f6b3652ae3aca5dc.zip FreeBSD-src-2fe0472e3949a7c045ea27f8f6b3652ae3aca5dc.tar.gz | |
MFI. This is a documentation-only, diffreducing patch, that if
invoked will cause breakage. US Users - DO NOT try to turn on
IDEA - the sources are not included.
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/Makefile.inc | 4 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile | 14 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 5 | ||||
| -rw-r--r-- | secure/usr.bin/openssl/Makefile | 2 |
4 files changed, 23 insertions, 2 deletions
diff --git a/secure/Makefile.inc b/secure/Makefile.inc index afe5e97..faa0bd2 100644 --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -15,3 +15,7 @@ CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj .else CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt .endif + +.if !defined(WITH_IDEA) || ${WITH_IDEA} != YES +CFLAGS+= -DNO_IDEA +.endif diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 5f5c853..55cdfb0 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -15,6 +15,10 @@ ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db \ ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/x509v3 +.if defined(WITH_IDEA) && ${WITH_IDEA} == YES +.PATH: ${LCRYPTO_SRC}/idea +.endif + LIB= crypto SHLIB_MAJOR= 1 @@ -98,6 +102,11 @@ SRCS+= bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c \ # hmac SRCS+= hmac.c +# idea +.if defined(WITH_IDEA) && ${WITH_IDEA} == YES +SRCS+= i_ecb.c i_cbc.c i_cfb64.c i_ofb64.c i_skey.c +.endif + # lhash SRCS+= lh_stats.c lhash.c @@ -176,6 +185,11 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \ sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h x509/x509.h \ x509/x509_vfy.h x509v3/x509v3.h +.if defined(WITH_IDEA) && ${WITH_IDEA} == YES +HDRS+= idea/idea.h +.endif + + .for h in ${HDRS} CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h} .endfor diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 6197d63..319d809 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,7 +1,10 @@ # $FreeBSD$ LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl/crypto -CFLAGS+= -DTERMIOS -DANSI_SOURCE -DNO_IDEA -I${LCRYPTO_SRC} -I${.OBJDIR} +CFLAGS+= -DTERMIOS -DANSI_SOURCE -I${LCRYPTO_SRC} -I${.OBJDIR} +.if !defined(WITH_IDEA) || ${WITH_IDEA} != YES +CFLAGS+= -DNO_IDEA +.endif .if ${MACHINE_ARCH} == "i386" CFLAGS+= -DL_ENDIAN diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile index 7499cb7..1cde16b 100644 --- a/secure/usr.bin/openssl/Makefile +++ b/secure/usr.bin/openssl/Makefile @@ -10,7 +10,7 @@ NOMAN= noman OPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/apps LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl/crypto -CFLAGS+= -DMONOLITH -DNO_IDEA -I${.CURDIR} +CFLAGS+= -DMONOLITH -I${.CURDIR} WITH_RSA?= YES .if ${WITH_RSA} == NO |
