diff options
| author | peter <peter@FreeBSD.org> | 2000-02-25 08:21:35 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2000-02-25 08:21:35 +0000 |
| commit | 47e3d89f30c983011b97b647e056ae2a3ad879c4 (patch) | |
| tree | e88155fa39f185666cbdb222545f510527c0a5d2 /secure | |
| parent | fe21c9e7b58cd6705488ad57779e46bf3b9c3261 (diff) | |
| download | FreeBSD-src-47e3d89f30c983011b97b647e056ae2a3ad879c4.zip FreeBSD-src-47e3d89f30c983011b97b647e056ae2a3ad879c4.tar.gz | |
Don't pull in libRSAglue for the rsaref case. Since this is linked
dynamically by default, we use the dlopen() calls to load librsaref.so
on US code trees.
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/usr.bin/openssl/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/scp/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-add/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keygen/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 4 |
7 files changed, 1 insertions, 25 deletions
diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile index 7922931..fe633b3 100644 --- a/secure/usr.bin/openssl/Makefile +++ b/secure/usr.bin/openssl/Makefile @@ -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 diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index 896f62c..80ad088 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -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 diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index bd53d72..5e8dbf2 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -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 diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index dc30ead..901f09e 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -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 diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 962ad41..27a230f 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -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 diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 3741ba40..33887f9 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -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 diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 6a36c29..a0e4fac 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -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 |
