d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fold libRSAglue into libcrypto so we don't have to special-case

Browse Source 
all the builds.  There is still no actual RSA implementation code
in libcrypto or src/* on US code trees.
This commit is contained in:
Peter Wemm 2000-02-25 08:18:43 +00:00
parent 3d5985cc5f
commit 07a0979e84
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=57474
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
secure/lib/Makefile
View File

@ -6,9 +6,6 @@ SUBDIR+=libtelnet
.endif
.if !defined(NO_OPENSSL)
SUBDIR+=libcrypto libssl
.if defined(RSAREF) && ${RSAREF} == YES
SUBDIR+=librsaglue
.endif
.endif
.if !defined(NO_OPENSSH)
SUBDIR+=libssh

8
secure/lib/libcrypto/Makefile
View File

@ -127,9 +127,11 @@ SRCS+= rmd_dgst.c rmd_one.c
.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 \
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
.if !defined(RSAREF) || ${RSAREF} != YES
SRCS+= rsa_eay.c
.endif
.endif
@ -214,7 +216,7 @@ beforeinstall: ${.OBJDIR}/openssl/opensslconf.h
${LCRYPTO_SRC}/mdc2 ${LCRYPTO_SRC}/objects ${LCRYPTO_SRC}/pem \
${LCRYPTO_SRC}/pkcs7 ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/rand \
${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}/x509 ${LCRYPTO_SRC}/x509v3

9
secure/lib/libcrypto/Makefile.inc
View File

@ -15,13 +15,8 @@ CFLAGS+= -DDEVRANDOM=\"/dev/urandom\"
LOCALBASE?= /usr/local
.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != NO
.if !exists(${LOCALBASE}/lib/librsaref.a)
CFLAGS+= -DNO_RSA -DNO_SSL2
WITH_RSA= NO
.else
WITH_RSA?= YES
.if (!defined(USA_RESIDENT) || ${USA_RESIDENT} != NO) && ${WITH_RSA} != NO
CFLAGS+= -DRSAref
RSAREF= YES
WITH_RSA= YES
.endif
.endif