Fold libRSAglue into libcrypto so we don't have to special-case
all the builds. There is still no actual RSA implementation code in libcrypto or src/* on US code trees.
This commit is contained in:
parent
3d5985cc5f
commit
07a0979e84
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=57474
@ -6,9 +6,6 @@ SUBDIR+=libtelnet
|
|||||||
.endif
|
.endif
|
||||||
.if !defined(NO_OPENSSL)
|
.if !defined(NO_OPENSSL)
|
||||||
SUBDIR+=libcrypto libssl
|
SUBDIR+=libcrypto libssl
|
||||||
.if defined(RSAREF) && ${RSAREF} == YES
|
|
||||||
SUBDIR+=librsaglue
|
|
||||||
.endif
|
|
||||||
.endif
|
.endif
|
||||||
.if !defined(NO_OPENSSH)
|
.if !defined(NO_OPENSSH)
|
||||||
SUBDIR+=libssh
|
SUBDIR+=libssh
|
||||||
|
@ -127,9 +127,11 @@ SRCS+= rmd_dgst.c rmd_one.c
|
|||||||
.if defined(WITH_RSA) && ${WITH_RSA} == YES
|
.if defined(WITH_RSA) && ${WITH_RSA} == YES
|
||||||
SRCS+= rsa_chk.c rsa_err.c rsa_gen.c rsa_lib.c rsa_none.c rsa_oaep.c \
|
SRCS+= rsa_chk.c rsa_err.c rsa_gen.c rsa_lib.c rsa_none.c rsa_oaep.c \
|
||||||
rsa_pk1.c rsa_saos.c rsa_sign.c rsa_ssl.c
|
rsa_pk1.c rsa_saos.c rsa_sign.c rsa_ssl.c
|
||||||
|
.if (!defined(RSAREF) || ${RSAREF} != YES) && exists(${LCRYPTO_SRC}/rsa/rsa_eay.c)
|
||||||
|
SRCS+= rsa_eay.c # native rsa
|
||||||
|
.else
|
||||||
|
SRCS+= rsar_err.c rsaref.c rsaref_stubs.c # external rsaref
|
||||||
HDRS+= ../rsaref/rsaref.h
|
HDRS+= ../rsaref/rsaref.h
|
||||||
.if !defined(RSAREF) || ${RSAREF} != YES
|
|
||||||
SRCS+= rsa_eay.c
|
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
@ -214,7 +216,7 @@ beforeinstall: ${.OBJDIR}/openssl/opensslconf.h
|
|||||||
${LCRYPTO_SRC}/mdc2 ${LCRYPTO_SRC}/objects ${LCRYPTO_SRC}/pem \
|
${LCRYPTO_SRC}/mdc2 ${LCRYPTO_SRC}/objects ${LCRYPTO_SRC}/pem \
|
||||||
${LCRYPTO_SRC}/pkcs7 ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/rand \
|
${LCRYPTO_SRC}/pkcs7 ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/rand \
|
||||||
${LCRYPTO_SRC}/rc2 ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 \
|
${LCRYPTO_SRC}/rc2 ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 \
|
||||||
${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/rsa \
|
${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/../rsaref \
|
||||||
${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db \
|
${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/txt_db \
|
||||||
${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/x509v3
|
${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/x509v3
|
||||||
|
|
||||||
|
@ -15,13 +15,8 @@ CFLAGS+= -DDEVRANDOM=\"/dev/urandom\"
|
|||||||
|
|
||||||
LOCALBASE?= /usr/local
|
LOCALBASE?= /usr/local
|
||||||
|
|
||||||
.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != NO
|
WITH_RSA?= YES
|
||||||
.if !exists(${LOCALBASE}/lib/librsaref.a)
|
.if (!defined(USA_RESIDENT) || ${USA_RESIDENT} != NO) && ${WITH_RSA} != NO
|
||||||
CFLAGS+= -DNO_RSA -DNO_SSL2
|
|
||||||
WITH_RSA= NO
|
|
||||||
.else
|
|
||||||
CFLAGS+= -DRSAref
|
CFLAGS+= -DRSAref
|
||||||
RSAREF= YES
|
RSAREF= YES
|
||||||
WITH_RSA= YES
|
|
||||||
.endif
|
|
||||||
.endif
|
.endif
|
||||||
|
Loading…
Reference in New Issue
Block a user