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.
This commit is contained in:
parent
bf0ad6d752
commit
ce09ad5098
@ -95,6 +95,9 @@ extern "C" {
|
||||
#ifndef NO_CAST
|
||||
#include <openssl/cast.h>
|
||||
#endif
|
||||
#ifndef NO_IDEA
|
||||
#include <openssl/idea.h>
|
||||
#endif
|
||||
#ifndef NO_MDC2
|
||||
#include <openssl/mdc2.h>
|
||||
#endif
|
||||
@ -366,6 +369,9 @@ typedef struct evp_cipher_ctx_st
|
||||
des_key_schedule ks3;/* key schedule (for ede3) */
|
||||
} des_ede;
|
||||
#endif
|
||||
#ifndef NO_IDEA
|
||||
IDEA_KEY_SCHEDULE idea_ks;/* key schedule */
|
||||
#endif
|
||||
#ifndef NO_RC2
|
||||
RC2_KEY rc2_ks;/* key schedule */
|
||||
#endif
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user