diff options
| author | markm <markm@FreeBSD.org> | 2000-02-24 21:10:28 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-02-24 21:10:28 +0000 |
| commit | 4dfdc66cab217db1c43f8f5db234a731900d85b0 (patch) | |
| tree | f8ea8e6a6680b0fc9f39e56667dfb083b48e64dd /usr.sbin | |
| parent | 7926f9a427cf41d969d72340286db7efb8743a66 (diff) | |
| download | FreeBSD-src-4dfdc66cab217db1c43f8f5db234a731900d85b0.zip FreeBSD-src-4dfdc66cab217db1c43f8f5db234a731900d85b0.tar.gz | |
Use libcrypto instead of libdes.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/keyserv/crypt_server.c | 12 | ||||
| -rw-r--r-- | usr.sbin/ppp/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/ppp/chap_ms.c | 2 | ||||
| -rw-r--r-- | usr.sbin/pppd/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/pppd/chap_ms.c | 2 |
5 files changed, 20 insertions, 12 deletions
diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c index 79b7923..51024b6 100644 --- a/usr.sbin/keyserv/crypt_server.c +++ b/usr.sbin/keyserv/crypt_server.c @@ -170,11 +170,11 @@ static void *dlhandle; #define _PATH_USRLIB "/usr/lib" #endif -#ifndef LIBDES +#ifndef LIBCRYPTO #ifdef OBJFORMAT_ELF -#define LIBDES "libdes.so.3" +#define LIBCRYPTO "libcrypto.so.1" #else -#define LIBDES "libdes.so.3." +#define LIBCRYPTO "libcrypto.so.1." #endif /* OBJFORMAT_ELF */ #endif @@ -190,9 +190,9 @@ void load_des(warn, libpath) if (libpath == NULL) { #ifdef OBJFORMAT_ELF - snprintf(dlpath, sizeof(dlpath), "%s/%s", _PATH_USRLIB, LIBDES); + snprintf(dlpath, sizeof(dlpath), "%s/%s", _PATH_USRLIB, LIBCRYPTO); #else - len = strlen(LIBDES); + len = strlen(LIBCRYPTO); if ((dird = opendir(_PATH_USRLIB)) == NULL) err(1, "opendir(/usr/lib) failed"); @@ -200,7 +200,7 @@ void load_des(warn, libpath) /* must have a minor number */ if (strlen(dirp->d_name) <= len) continue; - if (!strncmp(dirp->d_name, LIBDES, len)) { + if (!strncmp(dirp->d_name, LIBCRYPTO, len)) { if (atoi((dirp->d_name + len + 1)) > minor) { minor = atoi((dirp->d_name + len + 1)); snprintf(dlpath,sizeof(dlpath),"%s/%s", diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 480fb2e..6581761 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -37,8 +37,12 @@ DPADD+= ${LIBALIAS} DISTRIBUTION=des CFLAGS+=-DHAVE_DES SRCS+= chap_ms.c -LDADD+= -ldes -DPADD+= ${LIBDES} +LDADD+= -lcrypto +DPADD+= ${LIBCRYPTO} +.if defined(RSAREF) && ${RSAREF} == YES +LDADD+= -lRSAglue +DPADD+= ${LIBRSAGLUE} +.endif .endif .if defined(NORADIUS) diff --git a/usr.sbin/ppp/chap_ms.c b/usr.sbin/ppp/chap_ms.c index e1d495f..6530ef6 100644 --- a/usr.sbin/ppp/chap_ms.c +++ b/usr.sbin/ppp/chap_ms.c @@ -26,7 +26,7 @@ #include <sys/types.h> #include <ctype.h> -#include <des.h> +#include <openssl/des.h> #include <string.h> #include "chap_ms.h" diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index e994985..aef5bfc 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -32,8 +32,12 @@ DPADD+= ${LIBPCAP} DISTRIBUTION=des CFLAGS+=-DCHAPMS SRCS+= chap_ms.c -LDADD+= -ldes -DPADD+= ${LIBDES} +LDADD+= -lcrypto +DPADD+= ${LIBCRYPTO} +.if defined(RSAREF) && ${RSAREF} == YES +LDADD+= -lRSAglue +DPADD+= ${LIBRSAGLUE} +.endif .endif .if defined(RELEASE_CRUNCH) diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c index 72fa676..c3e1f6e 100644 --- a/usr.sbin/pppd/chap_ms.c +++ b/usr.sbin/pppd/chap_ms.c @@ -54,7 +54,7 @@ static char rcsid[] = "$FreeBSD$"; #include "md4.h" #ifndef USE_CRYPT -#include <des.h> +#include <openssl/des.h> #endif typedef struct { |
