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

Don't pull in libRSAglue for the rsaref case. Since this is linked

Browse Source 
dynamically by default, we use the dlopen() calls to load librsaref.so
on US code trees.
This commit is contained in:
peter 2000-02-25 08:21:35 +00:00
parent fe21c9e7b5
commit 47e3d89f30
7 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
secure/usr.bin/openssl/Makefile
View File

@ -18,7 +18,7 @@ LOCALBASE?= /usr/local
CFLAGS+= -DNO_RSA -DNO_SSL2
.else
CFLAGS+= -DRSAref
LDADD+= -lRSAglue ${LOCALBASE}/lib/librsaref.a
LDADD+= ${LOCALBASE}/lib/librsaref.a
.endif
.endif

4
secure/usr.bin/scp/Makefile
View File

@ -16,7 +16,3 @@ SRCS= scp.c
LDADD+= -lcrypto -lutil -lz -L${.OBJDIR}/../../lib/libssh -lssh
DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
.if defined(RSAREF) && ${RSAREF} == YES
LDADD+= -lRSAglue
DPADD+= ${LIBRSAGLUE}
.endif

4
secure/usr.bin/ssh-add/Makefile
View File

@ -16,7 +16,3 @@ SRCS= ssh-add.c log-client.c
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
.if defined(RSAREF) && ${RSAREF} == YES
LDADD+= -lRSAglue
DPADD+= ${LIBRSAGLUE}
.endif

4
secure/usr.bin/ssh-agent/Makefile
View File

@ -16,7 +16,3 @@ SRCS= ssh-agent.c log-client.c
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
.if defined(RSAREF) && ${RSAREF} == YES
LDADD+= -lRSAglue
DPADD+= ${LIBRSAGLUE}
.endif

4
secure/usr.bin/ssh-keygen/Makefile
View File

@ -16,7 +16,3 @@ SRCS= ssh-keygen.c log-client.c
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
.if defined(RSAREF) && ${RSAREF} == YES
LDADD+= -lRSAglue
DPADD+= ${LIBRSAGLUE}
.endif

4
secure/usr.bin/ssh/Makefile
View File

@ -35,7 +35,3 @@ DPADD+= ${LIBKRB5} ${LIBCOM_ERR}
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lutil -lz
DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
.if defined(RSAREF) && ${RSAREF} == YES
LDADD+= -lRSAglue
DPADD+= ${LIBRSAGLUE}
.endif

4
secure/usr.sbin/sshd/Makefile
View File

@ -37,7 +37,3 @@ DPADD+= ${LIBKRB5} ${LIBCOM_ERR}
LDADD+= -L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap
DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP}
.if defined(RSAREF) && ${RSAREF} == YES
LDADD+= -lRSAglue
DPADD+= ${LIBRSAGLUE}
.endif