diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-09-14 13:00:43 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-09-14 13:00:43 +0000 |
| commit | 0e50a833303122d7dd65362e24d823fd32945d75 (patch) | |
| tree | 89d24b3ace757e720aa805edd70372169e23c164 | |
| parent | 42415fcb525b6ef209945b93ca9878de9ecf9131 (diff) | |
Notes
| -rw-r--r-- | lib/libfetch/Makefile | 4 | ||||
| -rw-r--r-- | lib/libfetch/http.c | 8 | ||||
| -rw-r--r-- | usr.bin/fetch/Makefile | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index 7b29aa2df5e5..085aba2c6cb4 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -16,8 +16,8 @@ CFLAGS+= -DINET6 .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_SSL -DPADD= ${LIBSSL} ${LIBCRYPTO} ${LIBMD} -LDADD= -lssl -lcrypto -lmd +DPADD= ${LIBSSL} ${LIBCRYPTO} +LDADD= -lssl -lcrypto .else DPADD= ${LIBMD} LDADD= -lmd diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c index f6e063aa7121..97fe47c592ce 100644 --- a/lib/libfetch/http.c +++ b/lib/libfetch/http.c @@ -76,7 +76,15 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <time.h> #include <unistd.h> + +#ifdef WITH_SSL +#include <openssl/md5.h> +#define MD5Init(c) MD5_Init(c) +#define MD5Update(c, data, len) MD5_Update(c, data, len) +#define MD5Final(md, c) MD5_Final(md, c) +#else #include <md5.h> +#endif #include <netinet/in.h> #include <netinet/tcp.h> diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index 6f0db80ca4d7..687f3eac73d1 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -4,11 +4,12 @@ PROG= fetch CSTD?= c99 +.if ${MK_OPENSSL} != "no" +DPADD= ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO} +LDADD= -lfetch -lssl -lcrypto +.else DPADD= ${LIBFETCH} ${LIBMD} LDADD= -lfetch -lmd -.if ${MK_OPENSSL} != "no" -DPADD+= ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lssl -lcrypto .endif .include <bsd.prog.mk> |