remove testing leftover #undef OPENSSL

warning cleanup
linking with libntp now requires -lcrypto / libeay32.lib

bk: 4af21b3aT4zJm6yZVymrjtW0kjTlaA

diff --git a/include/ntp_stdlib.h b/include/ntp_stdlib.h
index f92bb9f9c3bdc3492a078137fb27380759d743e2..c7c9e4abd98b797dffa508271304424328803e0e 100644 (file)
--- a/include/ntp_stdlib.h
+++ b/include/ntp_stdlib.h
@@ -36,6 +36,14 @@
 extern void    msyslog         (int, const char *, ...)
                                __attribute__((__format__(__printf__, 2, 3)));
 
+/*
+ * When building without OpenSSL, use one constant #define, NID_md5,
+ * for the keytype.  MD5 is the only digest supported without OpenSSL.
+ */
+#ifndef OPENSSL
+#define NID_md5        4       /* from openssl/objects.h */
+#endif
+
 extern void    auth_delkeys    (void);
 extern int     auth_havekey    (keyid_t);
 extern int     authdecrypt     (keyid_t, u_int32 *, int, int);

diff --git a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c
index e111b8c27123e8b11ee6373e8accc574bdae672f..7e392d31d81d3b3fc0733e2e264d8b8900bc082e 100644 (file)
--- a/libntp/a_md5encrypt.c
+++ b/libntp/a_md5encrypt.c
@@ -1,11 +1,5 @@
 /*
- *     MD5 interface for rsaref2.0
- *
- * These routines implement an interface for the RSA Laboratories
- * implementation of the Message Digest 5 (MD5) algorithm. This
- * algorithm is included in the rsaref2.0 package available from RSA in
- * the US and foreign countries. Further information is available at
- * www.rsa.com.
+ *     digest support for NTP, MD5 and with OpenSSL more
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,11 +9,8 @@
 #include "ntp_fp.h"
 #include "ntp_string.h"
 #include "ntp_stdlib.h"
-
-#undef OPENSSL         /* disable OpenSSL for test */
-
+#include "ntp_assert.h"
 #include "ntp.h"
-#include "global.h"
 #ifdef OPENSSL
 #include "openssl/evp.h"
 #else
@@ -39,19 +30,22 @@ MD5authencrypt(
        int     length          /* packet length */
        )
 {
-       u_char  digest[20];
-       int     len;
+       u_char          digest[20];
+       unsigned        len;
 #ifdef OPENSSL
-       EVP_MD_CTX ctx;
+       const EVP_MD *  digest_type;
+       EVP_MD_CTX      ctx;
 #else
-       MD5_CTX md5;
+       MD5_CTX         md5;
 #endif /* OPENSSL */
 
        /*
         * MD5 with key identifier concatenated with packet.
         */
 #ifdef OPENSSL
-       EVP_DigestInit(&ctx, EVP_get_digestbynid(type));
+       digest_type = EVP_get_digestbynid(type);
+       NTP_INSIST(digest_type != NULL);
+       EVP_DigestInit(&ctx, digest_type);
        EVP_DigestUpdate(&ctx, key, (u_int)cache_keylen);
        EVP_DigestUpdate(&ctx, (u_char *)pkt, (u_int)length);
        EVP_DigestFinal(&ctx, digest, &len);
@@ -81,12 +75,12 @@ MD5authdecrypt(
        int     size            /* MAC size */
        )
 {
-       u_char  digest[20];
-       int     len;
+       u_char          digest[20];
+       unsigned        len;
 #ifdef OPENSSL
-       EVP_MD_CTX ctx;
+       EVP_MD_CTX      ctx;
 #else
-       MD5_CTX md5;
+       MD5_CTX         md5;
 #endif /* OPENSSL */
 
        /*
@@ -104,7 +98,7 @@ MD5authdecrypt(
        MD5Final(digest, &md5);
        len = 16;
 #endif /* OPENSSL */
-       if (size != len + 4)
+       if ((unsigned)size != len + 4)
                return (0);
 
        return (!memcmp(digest, (char *)pkt + length + 4, len));
@@ -118,11 +112,11 @@ MD5authdecrypt(
 u_int32
 addr2refid(sockaddr_u *addr)
 {
-       u_char  digest[20];
-       u_int32 addr_refid;
+       u_char          digest[20];
+       u_int32         addr_refid;
 #ifdef OPENSSL
-       EVP_MD_CTX ctx;
-       int     len;
+       EVP_MD_CTX      ctx;
+       unsigned        len;
 #else
        MD5_CTX md5;
 #endif /* OPENSSL */
@@ -131,10 +125,10 @@ addr2refid(sockaddr_u *addr)
                return (NSRCADR(addr));
 
 #ifdef OPENSSL
-        EVP_DigestInit(&ctx, EVP_md5());
-        EVP_DigestUpdate(&ctx, (u_char *)PSOCK_ADDR6(addr),
+       EVP_DigestInit(&ctx, EVP_md5());
+       EVP_DigestUpdate(&ctx, (u_char *)PSOCK_ADDR6(addr),
            sizeof(struct in6_addr));
-        EVP_DigestFinal(&ctx, digest, &len);
+       EVP_DigestFinal(&ctx, digest, &len);
 #else
        MD5Init(&md5);
        MD5Update(&md5, (u_char *)PSOCK_ADDR6(addr),

diff --git a/libntp/authreadkeys.c b/libntp/authreadkeys.c
index b60593e8a0017b38c4532e19e1fe8cf727eb45da..95fd7759c83ba0e31b5424868bb5573efa210cb1 100644 (file)
--- a/libntp/authreadkeys.c
+++ b/libntp/authreadkeys.c
@@ -1,6 +1,7 @@
 /*
  * authreadkeys.c - routines to support the reading of the key file
  */
+#include <config.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -9,8 +10,6 @@
 #include "ntp_syslog.h"
 #include "ntp_stdlib.h"
 
-#undef OPENSSL /* disable  OpenSSL for text */
-
 #ifdef OPENSSL
 #include "openssl/objects.h"
 #endif /* OPENSSL *.
@@ -101,13 +100,13 @@ authreadkeys(
        while ((line = fgets(buf, sizeof buf, fp)) != NULL) {
                token = nexttok(&line);
                if (token == NULL)
-                   continue;
+                       continue;
                
                /*
                 * First is key number.  See if it is okay.
                 */
                keyno = atoi(token);
-               if (keyno == NULL) {
+               if (keyno == 0) {
                        msyslog(LOG_ERR,
                            "cannot change key %s", token);
                        continue;
@@ -145,7 +144,7 @@ authreadkeys(
                            "invalid key type for key %ld", keyno);
                        continue;
                }
-#else
+#else  /* !OPENSSL */
 
                /*
                 * The key type is unused, but is required to be 'M' or
@@ -156,7 +155,8 @@ authreadkeys(
                            "invalid key type for key %ld", keyno);
                        continue;
                }
-#endif /* OPENSSL */
+               keytype = NID_md5;
+#endif /* !OPENSSL */
 
                /*
                 * Finally, get key and insert it

diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index 1ab3d7b304a71ca441f1a5e5d7bdf66b2f09bfec..53eecb08777b85f91704da19d1fced2010746401 100644 (file)
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -14,6 +14,7 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
 
 # LDADD might need RESLIB and ADJLIB
 LDADD=         version.o ../libntp/libntp.a
+ntpdate_LDADD= $(LDADD) @LCRYPTO@
 DISTCLEANFILES=        .version version.c stamp-v
 noinst_HEADERS=        ntpdate.h
 ETAGS_ARGS=    Makefile.am

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 968119faf5768bb9b5df6cd57fb298c6a915648b..a1e5b858cd55661d76828fc01b4d6528a22c03d7 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -10,7 +10,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
        -I$(top_srcdir)/lib/isc/nothreads/include \
        -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
 # LDADD might need RESLIB and ADJLIB
-ntpdc_LDADD=   version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) ../libntp/libntp.a
+ntpdc_LDADD=   version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+               ../libntp/libntp.a
 # ntpdc-layout doesn't need any additional libraries at all
 ntpdc_layout_LDADD=
 DISTCLEANFILES=        .version version.c

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 0109a3575c42aab65bde678781012abd475f2ad3..fc96b495fb2c0107d4aef97d999aa3cfc21a7ce1 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -8,7 +8,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
        -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
 
 # LDADD might need RESLIB and ADJLIB
-ntpq_LDADD=    version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) ../libntp/libntp.a
+ntpq_LDADD=    version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+               ../libntp/libntp.a
 noinst_HEADERS=        ntpq.h
 noinst_LIBRARIES=      libntpq.a
 # HMS: I don't think we need libntpq_a_LIBADD...

diff --git a/ports/winnt/vc6/ntpdate.dsp b/ports/winnt/vc6/ntpdate.dsp
index 1eb8860cf2bf3b25aadb61caa6c5aef387da46f8..4a894ccec62b7dd3d7b58c4e52360313b3924377 100644 (file)
--- a/ports/winnt/vc6/ntpdate.dsp
+++ b/ports/winnt/vc6/ntpdate.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /pdb:"bin/Release/ntpdate.pdb" /machine:I386 /out:"bin/Release/ntpdate.exe" /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(OPENSSL_LIB)\libeay32.lib /nologo /subsystem:console /pdb:"bin/Release/ntpdate.pdb" /machine:I386 /out:"bin/Release/ntpdate.exe" /pdbtype:sept\r
 \r
 !ELSEIF  "$(CFG)" == "ntpdate - Win32 Debug"\r
 \r
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /pdb:"bin/Debug/ntpdate.pdb" /debug /machine:I386 /out:"bin/Debug/ntpdate.exe" /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(OPENSSL_LIB)\libeay32.lib /nologo /subsystem:console /pdb:"bin/Debug/ntpdate.pdb" /debug /machine:I386 /out:"bin/Debug/ntpdate.exe" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/ports/winnt/vc6/ntpdc.dsp b/ports/winnt/vc6/ntpdc.dsp
index 1a86e8d76a9caccc49a7c38447b7ecac5671d519..3d4d73bd52ddf35c244c8b249aca817c5032251b 100644 (file)
--- a/ports/winnt/vc6/ntpdc.dsp
+++ b/ports/winnt/vc6/ntpdc.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console  /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib ws2_32.lib advapi32.lib /nologo /subsystem:console /pdb:"bin/Release/ntpdc.pdb" /machine:I386 /out:"bin/Release/ntpdc.exe" /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib ws2_32.lib advapi32.lib $(OPENSSL_LIB)\libeay32.lib /nologo /subsystem:console /pdb:"bin/Release/ntpdc.pdb" /machine:I386 /out:"bin/Release/ntpdc.exe" /pdbtype:sept\r
 \r
 !ELSEIF  "$(CFG)" == "ntpdc - Win32 Debug"\r
 \r
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib ws2_32.lib advapi32.lib /nologo /subsystem:console /pdb:"bin/Debug/ntpdc.pdb" /debug /machine:I386 /out:"bin/Debug/ntpdc.exe" /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib ws2_32.lib advapi32.lib $(OPENSSL_LIB)\libeay32.lib /nologo /subsystem:console /pdb:"bin/Debug/ntpdc.pdb" /debug /machine:I386 /out:"bin/Debug/ntpdc.exe" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r

diff --git a/ports/winnt/vc6/ntpq.dsp b/ports/winnt/vc6/ntpq.dsp
index 3b3a6af0356dc029f91e94a23eb53fb5f3a76493..7c8666e8e366b116afd6ed4adbaf32344cfaa1fb 100644 (file)
--- a/ports/winnt/vc6/ntpq.dsp
+++ b/ports/winnt/vc6/ntpq.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib ws2_32.lib advapi32.lib /nologo /subsystem:console /pdb:"bin/Release/ntpq.pdb" /machine:I386 /out:"bin/Release/ntpq.exe" /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib ws2_32.lib advapi32.lib $(OPENSSL_LIB)\libeay32.lib /nologo /subsystem:console /pdb:"bin/Release/ntpq.pdb" /machine:I386 /out:"bin/Release/ntpq.exe" /pdbtype:sept\r
 \r
 !ELSEIF  "$(CFG)" == "ntpq - Win32 Debug"\r
 \r
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib ws2_32.lib advapi32.lib /nologo /subsystem:console /pdb:"bin/Debug/ntpq.pdb" /debug /machine:I386 /out:"bin/Debug/ntpq.exe" /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib ws2_32.lib advapi32.lib $(OPENSSL_LIB)\libeay32.lib /nologo /subsystem:console /pdb:"bin/Debug/ntpq.pdb" /debug /machine:I386 /out:"bin/Debug/ntpq.exe" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r

diff --git a/ports/winnt/vs2003/ntpdate.vcproj b/ports/winnt/vs2003/ntpdate.vcproj
index 979d2195af229c7846b55cf23d5d91081654be72..30e63975ea14f9308d697952c15d15c677d5db85 100644 (file)
--- a/ports/winnt/vs2003/ntpdate.vcproj
+++ b/ports/winnt/vs2003/ntpdate.vcproj
@@ -39,7 +39,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Debug/ntpdate.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -101,7 +101,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Release/ntpdate.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"

diff --git a/ports/winnt/vs2003/ntpdc.vcproj b/ports/winnt/vs2003/ntpdc.vcproj
index 2a5e4fa1f2c3ecf4d06729778f10e9901d5e30ef..c087d49d641c73b94562115852f2cf550ff621ad 100644 (file)
--- a/ports/winnt/vs2003/ntpdc.vcproj
+++ b/ports/winnt/vs2003/ntpdc.vcproj
@@ -40,7 +40,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Debug/ntpdc.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -103,7 +103,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Release/ntpdc.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"

diff --git a/ports/winnt/vs2003/ntpq.vcproj b/ports/winnt/vs2003/ntpq.vcproj
index 39ccb68018709e58597c689b8d46b7fcf1275626..45b14d1a731ee666752d9fede33a6897118274b8 100644 (file)
--- a/ports/winnt/vs2003/ntpq.vcproj
+++ b/ports/winnt/vs2003/ntpq.vcproj
@@ -39,7 +39,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Release/ntpq.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -100,7 +100,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Debug/ntpq.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"

diff --git a/ports/winnt/vs2005/ntpdate.vcproj b/ports/winnt/vs2005/ntpdate.vcproj
index b65f80a62972fddbf66b7ad2f58c73e27d8ab360..ee5b9dcd93d09250c516fff6c1c7fa605a53d4b4 100644 (file)
--- a/ports/winnt/vs2005/ntpdate.vcproj
+++ b/ports/winnt/vs2005/ntpdate.vcproj
@@ -70,7 +70,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Debug/ntpdate.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
@@ -162,7 +162,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Release/ntpdate.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"

diff --git a/ports/winnt/vs2005/ntpdc.vcproj b/ports/winnt/vs2005/ntpdc.vcproj
index 0a5c1a42ecd490208338ae6bc5933aacc51c45e3..a3eb4070aded5eb6b16e467b2da99fb86c0a06d2 100644 (file)
--- a/ports/winnt/vs2005/ntpdc.vcproj
+++ b/ports/winnt/vs2005/ntpdc.vcproj
@@ -70,7 +70,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Debug/ntpdc.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
@@ -162,7 +162,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Release/ntpdc.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"

diff --git a/ports/winnt/vs2005/ntpq.vcproj b/ports/winnt/vs2005/ntpq.vcproj
index 66f87045e994f18b8a7b9df33d0b681dd8230cd3..54f108661066cc7a2f2e4b4560ac020c76c33e5b 100644 (file)
--- a/ports/winnt/vs2005/ntpq.vcproj
+++ b/ports/winnt/vs2005/ntpq.vcproj
@@ -69,7 +69,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Release/ntpq.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
@@ -161,7 +161,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\libeay32.lib"
                                OutputFile="bin/Debug/ntpq.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"

diff --git a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj
index 659fe388d4308867fda7c6ae0ba8e5fd4d180466..25013b5c61e7ea9a1ad84dff9b88da7173eef153 100644 (file)
--- a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj
+++ b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj
@@ -74,7 +74,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MDd.lib"
                                OutputFile="..\bin\Debug\ntpdate.exe"
                                Version="0x0400"
                                LinkIncremental="1"
@@ -172,7 +172,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MD.lib"
                                OutputFile="..\bin\Release\ntpdate.exe"
                                Version="0x0400"
                                LinkIncremental="1"

diff --git a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj
index 02316e27b81cd66ca1dc4ba844fa4042b93f2f06..04b0e962b75baccc8563f3fc83dea67c8e247f42 100644 (file)
--- a/ports/winnt/vs2008/ntpdc/ntpdc.vcproj
+++ b/ports/winnt/vs2008/ntpdc/ntpdc.vcproj
@@ -74,7 +74,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MDd.lib"
                                OutputFile="..\bin\Debug\ntpdc.exe"
                                Version="0x0400"
                                LinkIncremental="1"
@@ -171,7 +171,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MD.lib"
                                OutputFile="..\bin\Release\ntpdc.exe"
                                Version="0x0400"
                                LinkIncremental="1"

diff --git a/ports/winnt/vs2008/ntpq/ntpq.vcproj b/ports/winnt/vs2008/ntpq/ntpq.vcproj
index 45ff42470bb09bb4d33d9bca45932409ce26e716..be005e72218ed88c282fed81d99634c513c7b018 100644 (file)
--- a/ports/winnt/vs2008/ntpq/ntpq.vcproj
+++ b/ports/winnt/vs2008/ntpq/ntpq.vcproj
@@ -73,7 +73,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MD.lib"
                                OutputFile="..\bin\Release\ntpq.exe"
                                Version="0x0400"
                                LinkIncremental="1"
@@ -171,7 +171,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="ws2_32.lib"
+                               AdditionalDependencies="ws2_32.lib $(OPENSSL_LIB)\vc\libeay32MDd.lib"
                                OutputFile="..\bin\Debug\ntpq.exe"
                                Version="0x0400"
                                LinkIncremental="1"