projects / packages / ntp.git / blame
| Commit | Line | Data |
|---|---|---|
| 6754e9cd AM |
1 | --- ntp-4.2.0/configure.ac 2006-09-13 10:51:32.253439861 +0300 |
| 2 | +++ ntp-4.2.0.ssl/configure.ac 2006-10-02 23:07:07.809947790 +0300 | |
| 3 | @@ -330,8 +330,10 @@ | |
| f5c5302f ER |
4 | AC_CHECK_FUNC(openlog, , |
| 5 | AC_CHECK_LIB(gen, openlog, , | |
| 6754e9cd AM |
6 | AC_CHECK_LIB(syslog, openlog, , , $libxnet -lsocket))) |
| 7 | +AC_CHECK_LIB(crypto, MD5_Init, , | |
| f5c5302f ER |
8 | AC_CHECK_LIB(md5, MD5Init, , |
| 9 | AC_CHECK_LIB(md, MD5Init)) | |
| 10 | +) | |
| 11 | AC_CHECK_FUNCS(MD5Init) | |
| 12 | dnl HMS: What a hack... | |
| 13 | AC_CHECK_HEADERS(readline/history.h readline/readline.h) | |
| 75717a14 ER |
14 | --- ntp-4.2.0/include/ntp_md5.h 2003-07-17 13:27:16.000000000 +0300 |
| 15 | +++ ntp-4.2.0.ssl/include/ntp_md5.h 2006-10-02 23:15:24.871129536 +0300 | |
| 16 | @@ -2,8 +2,15 @@ | |
| 17 | * ntp_md5.h: deal with md5.h headers | |
| 18 | */ | |
| 19 | ||
| 20 | +#ifdef HAVE_LIBCRYPTO | |
| 21 | +# include <openssl/md5.h> | |
| 22 | +#define MD5Update MD5_Update | |
| 23 | +#define MD5Final MD5_Final | |
| 24 | +#define MD5Init MD5_Init | |
| 25 | +#else | |
| 26 | #ifdef HAVE_MD5_H | |
| 27 | # include <md5.h> | |
| 28 | #else | |
| 29 | # include "rsa_md5.h" | |
| 30 | #endif | |
| 31 | +#endif | |
| 361800ae | 32 | --- ntp-4.2.0/libntp/md5c.c~ 2003-07-17 12:27:22.000000000 +0200 |
| 33 | +++ ntp-4.2.0/libntp/md5c.c 2007-02-22 13:51:00.000000000 +0100 | |
| 34 | @@ -24,7 +24,7 @@ | |
| 35 | */ | |
| 36 | ||
| 37 | #include "global.h" | |
| 38 | -#ifndef HAVE_MD5INIT | |
| 39 | +#if !HAVE_MD5INIT && !HAVE_LIBCRYPTO | |
| 40 | #include "ntp_md5.h" | |
| 41 | ||
| 42 | /* Constants for MD5Transform routine. |