From: Danny Mayer Date: Sat, 1 Feb 2003 23:58:49 +0000 (-0500) Subject: Add support for OpenSSL, fixing type bugs and asn2ntp unsigned error and add X-Git-Tag: NTP_4_1_80_RC1~95^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa0439be1b286d9bb1cb4493dcae1d66bc6b96ff;p=thirdparty%2Fntp.git Add support for OpenSSL, fixing type bugs and asn2ntp unsigned error and add Win32 support for readlink. bk: 3e3c5f397P1N_igu4ct6nazHYoxGgg --- diff --git a/include/ntp.h b/include/ntp.h index 467c9e4355..2a4fea3bad 100644 --- a/include/ntp.h +++ b/include/ntp.h @@ -265,8 +265,8 @@ struct peer { u_int32 crypto; /* peer status word */ EVP_PKEY *pkey; /* public key */ const EVP_MD *digest; /* message digest algorithm */ - u_char *subject; /* certificate subject name */ - u_char *issuer; /* certificate issuer name */ + char *subject; /* certificate subject name */ + char *issuer; /* certificate issuer name */ keyid_t pkeyid; /* previous key ID */ keyid_t pcookie; /* peer cookie */ EVP_PKEY *ident_pkey; /* identity key */ diff --git a/include/ntp_crypto.h b/include/ntp_crypto.h index c216618343..fb1955ce40 100644 --- a/include/ntp_crypto.h +++ b/include/ntp_crypto.h @@ -147,8 +147,8 @@ struct cert_info { u_long serial; /* serial number */ tstamp_t first; /* valid not before */ tstamp_t last; /* valid not after */ - u_char *subject; /* subject common name */ - u_char *issuer; /* issuer common name */ + char *subject; /* subject common name */ + char *issuer; /* issuer common name */ u_char *grpkey; /* GQ group key */ u_int grplen; /* GQ group key length */ struct value cert; /* certificate/value */ diff --git a/include/ntp_machine.h b/include/ntp_machine.h index 303b87e98e..65ef5be88e 100644 --- a/include/ntp_machine.h +++ b/include/ntp_machine.h @@ -273,6 +273,7 @@ typedef unsigned long u_long; # define fileno _fileno # define write _write # define vsnprintf _vsnprintf +# define snprintf _snprintf #ifndef close # define close _close #endif diff --git a/include/ntpd.h b/include/ntpd.h index 622232a680..a90ffee8b6 100644 --- a/include/ntpd.h +++ b/include/ntpd.h @@ -145,7 +145,7 @@ extern void crypto_update P((void)); extern void crypto_config P((int, char *)); extern void crypto_setup P((void)); extern u_int crypto_ident P((struct peer *)); -extern struct exten *crypto_args P((struct peer *, u_int, u_char *)); +extern struct exten *crypto_args P((struct peer *, u_int, char *)); extern int crypto_public P((struct peer *, u_char *, u_int)); extern void value_free P((struct value *)); #endif /* OPENSSL */ diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c index 5fc2b282db..d1c322f422 100644 --- a/ntpd/ntp_crypto.c +++ b/ntpd/ntp_crypto.c @@ -158,6 +158,12 @@ static int bighash P((BIGNUM *, BIGNUM *)); static struct cert_info *crypto_cert P((char *)); static void crypto_tai P((char *)); +//#ifdef SYS_WINNT +int +readlink(char * link, char * file, int len) { + return (-1); +} + /* * session_key - generate session key * @@ -364,7 +370,7 @@ crypto_recv( u_int code; /* extension field opcode */ u_int vallen = 0; /* value length */ X509 *cert; /* X509 certificate */ - u_char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ + char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ keyid_t cookie; /* crumbles */ int rval = XEVNT_OK; u_char *ptr; @@ -1143,7 +1149,7 @@ crypto_xmit( struct exten *fp; /* extension pointers */ struct cert_info *cp; /* certificate info/value pointer */ char certname[MAXHOSTNAME + 1]; /* subject name buffer */ - u_char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ + char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ u_int vallen; u_int len; struct value vtemp; @@ -1189,7 +1195,7 @@ crypto_xmit( vtemp.tstamp = ep->tstamp; vtemp.fstamp = ep->fstamp; vtemp.vallen = ep->vallen; - vtemp.ptr = (char *)ep->pkt; + vtemp.ptr = (unsigned char *)ep->pkt; len += crypto_send(fp, &vtemp); break; @@ -1687,7 +1693,7 @@ struct exten * crypto_args( struct peer *peer, /* peer structure pointer */ u_int opcode, /* operation code */ - u_char *str /* argument string */ + char *str /* argument string */ ) { tstamp_t tstamp; /* NTP timestamp */ @@ -1715,7 +1721,7 @@ crypto_args( ep->vallen = 0; if (str != NULL) { ep->vallen = htonl(strlen(str)); - memcpy(ep->pkt, str, strlen(str)); + memcpy((char *)ep->pkt, str, strlen(str)); } else { ep->pkt[0] = peer->associd; } @@ -1790,7 +1796,7 @@ crypto_update(void) { EVP_MD_CTX ctx; /* message digest context */ struct cert_info *cp, **zp; /* certificate info/value */ - u_char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ + char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ tstamp_t tstamp; /* NTP timestamp */ u_int len; @@ -1920,7 +1926,7 @@ asn2ntp ( * greater than 100. Dontcha love ASN.1? Better than MIL-188. */ if (asn1time->length > 13) - return (-1); + return ((u_long)(~0)); /* We can't use -1 here. It's invalid */ v = (char *)asn1time->data; tm.tm_year = (v[0] - '0') * 10 + v[1] - '0'; if (tm.tm_year < 50) @@ -2865,16 +2871,17 @@ cert_parse( X509V3_EXT_METHOD *method; STACK_OF(CONF_VALUE) *nval; CONF_VALUE *val; - u_char pathbuf[MAXFILENAME]; - u_char *ptr; + char pathbuf[MAXFILENAME]; + u_char *uptr; + char *ptr; char *ext_str; int temp, cnt, i; /* * Decode ASN.1 objects and construct certificate structure. */ - ptr = asn1cert; - if ((cert = d2i_X509(NULL, &ptr, len)) == NULL) { + uptr = asn1cert; + if ((cert = d2i_X509(NULL, &uptr, len)) == NULL) { msyslog(LOG_ERR, "cert_parse %s\n", ERR_error_string(ERR_get_error(), NULL)); return (NULL); @@ -2895,7 +2902,8 @@ cert_parse( ret->version = X509_get_version(cert); X509_NAME_oneline(X509_get_subject_name(cert), pathbuf, MAXFILENAME - 1); - if ((ptr = strstr(pathbuf, "CN=")) == NULL) { + ptr = strstr(pathbuf, "CN="); + if (ptr == NULL) { msyslog(LOG_ERR, "cert_parse: invalid subject %s", pathbuf); cert_free(ret); @@ -2949,8 +2957,8 @@ cert_parse( * insists on text strings. */ case NID_ext_key_usage: - ptr = ext->value->data; - ext_str = method->d2i(NULL, &ptr, + uptr = ext->value->data; + ext_str = method->d2i(NULL, &uptr, ext->value->length); nval = method->i2v(method, ext_str, NULL); val = sk_CONF_VALUE_value(nval, 0); @@ -3095,7 +3103,7 @@ cert_sign( X509_gmtime_adj(X509_get_notAfter(cert), YEAR); subj = X509_get_issuer_name(cert); X509_NAME_add_entry_by_txt(subj, "commonName", MBSTRING_ASC, - sys_hostname, strlen(sys_hostname), -1, 0); + (unsigned char *) sys_hostname, strlen(sys_hostname), -1, 0); subj = X509_get_subject_name(req); X509_set_subject_name(cert, subj); X509_set_pubkey(cert, pkey); @@ -3370,9 +3378,9 @@ crypto_key( EVP_PKEY *pkey = NULL; /* public/private key */ char filename[MAXFILENAME]; /* name of key file */ char linkname[MAXFILENAME]; /* file link (for filestamp) */ - u_char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ + char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ int rval; - u_char *ptr; + char *ptr; /* * Open the key file. If the first character of the file @@ -3448,11 +3456,11 @@ crypto_cert( FILE *str; /* file handle */ char filename[MAXFILENAME]; /* name of certificate file */ char linkname[MAXFILENAME]; /* file link (for filestamp) */ - u_char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ + char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ tstamp_t fstamp; /* filestamp */ int rval; u_int len; - u_char *ptr; + char *ptr; char *name, *header; u_char *data; @@ -3537,15 +3545,15 @@ crypto_tai( ) { FILE *str; /* file handle */ - u_char buf[NTP_MAXSTRLEN]; /* file line buffer */ + char buf[NTP_MAXSTRLEN]; /* file line buffer */ u_int leapsec[MAX_LEAP]; /* NTP time at leaps */ u_int offset; /* offset at leap (s) */ char filename[MAXFILENAME]; /* name of leapseconds file */ char linkname[MAXFILENAME]; /* file link (for filestamp) */ - u_char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ + char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ tstamp_t fstamp; /* filestamp */ u_int len; - u_char *ptr; + char *ptr; int rval, i; #ifdef KERNEL_PLL #if NTP_API > 3 @@ -3625,7 +3633,7 @@ crypto_tai( len = i * 4; tai_leap.vallen = htonl(len); ptr = emalloc(len); - tai_leap.ptr = ptr; + tai_leap.ptr = (unsigned char *) ptr; for (; i >= 0; i--) { *ptr++ = htonl(leapsec[i]); } @@ -3746,7 +3754,7 @@ crypto_setup(void) msyslog(LOG_ERR, "warning: host key is not RSA key type"); hostval.vallen = htonl(strlen(sys_hostname)); - hostval.ptr = sys_hostname; + hostval.ptr = (unsigned char *) sys_hostname; /* * Construct public key extension field for agreement scheme. diff --git a/ntpd/ntp_peer.c b/ntpd/ntp_peer.c index e4d521f1bf..ecc5c26bb5 100644 --- a/ntpd/ntp_peer.c +++ b/ntpd/ntp_peer.c @@ -338,7 +338,7 @@ unpeer( { int hash; #ifdef OPENSSL - u_char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ + char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ if (peer_to_remove->flags & FLAG_SKEY) { sprintf(statstr, "unpeer %d flash %x reach %03o flags %04x", @@ -544,7 +544,7 @@ newpeer( register struct peer *peer; register int i; #ifdef OPENSSL - u_char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ + char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ #endif /* OPENSSL */ /* diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c index 81d2ac6129..ad8c15e207 100644 --- a/ntpd/ntp_timer.c +++ b/ntpd/ntp_timer.c @@ -215,7 +215,7 @@ timer(void) { register struct peer *peer, *next_peer; #ifdef OPENSSL - u_char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ + char statstr[NTP_MAXSTRLEN]; /* statistics for filegen */ #endif /* OPENSSL */ u_int n; diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c index 1853d61024..30e263ae3b 100644 --- a/ntpdate/ntpdate.c +++ b/ntpdate/ntpdate.c @@ -70,7 +70,10 @@ struct timeval timeout = {60,0}; #include "recvbuff.h" #ifdef SYS_WINNT -# define TARGET_RESOLUTION 1 /* Try for 1-millisecond accuracy +#define EPROTONOSUPPORT WSAEPROTONOSUPPORT +#define EAFNOSUPPORT WSAEAFNOSUPPORT +#define EPFNOSUPPORT WSAEPFNOSUPPORT +#define TARGET_RESOLUTION 1 /* Try for 1-millisecond accuracy on Windows NT timers. */ #pragma comment(lib, "winmm") #endif /* SYS_WINNT */ diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h index 04271f7958..11a88f5e3a 100644 --- a/ports/winnt/include/config.h +++ b/ports/winnt/include/config.h @@ -27,6 +27,8 @@ * ANSI C compliance enabled */ #define __STDC__ 1 +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 /* Skip asynch rpc inclusion */ #ifndef __RPCASYNC_H__ @@ -44,6 +46,9 @@ #define MAXHOSTNAMELEN 64 #define AUTOKEY +/* Enable OpenSSL */ +#define OPENSSL 1 + #define finite _finite # define random rand # define srandom srand @@ -86,8 +91,6 @@ int NT_set_process_priority(void); /* Define this function */ # define TIME_WITH_SYS_TIME # define HAVE_IO_COMPLETION_PORT # define HAVE_SOCKADDR_IN6 -//# define volatile -# define STDC_HEADERS # define NEED_S_CHAR_TYPEDEF diff --git a/ports/winnt/libisc/isc_strerror.c b/ports/winnt/libisc/isc_strerror.c index 58d4c6543f..70a92732c3 100644 --- a/ports/winnt/libisc/isc_strerror.c +++ b/ports/winnt/libisc/isc_strerror.c @@ -19,7 +19,7 @@ #include #include -#include +#include /* * Forward declarations diff --git a/ports/winnt/libntp/libntp.dsp b/ports/winnt/libntp/libntp.dsp index 77d65871ff..e302182b5a 100644 --- a/ports/winnt/libntp/libntp.dsp +++ b/ports/winnt/libntp/libntp.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /FI"windows.h" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /FI"windows.h" /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -221,6 +221,10 @@ SOURCE=..\..\..\libntp\iosignal.c # End Source File # Begin Source File +SOURCE=..\libisc\isc_strerror.c +# End Source File +# Begin Source File + SOURCE=..\..\..\libisc\lib.c # End Source File # Begin Source File @@ -349,10 +353,6 @@ SOURCE=..\..\..\libntp\statestr.c # End Source File # Begin Source File -SOURCE=.\strerror.c -# End Source File -# Begin Source File - SOURCE=.\syslog.c # End Source File # Begin Source File diff --git a/ports/winnt/ntpd/nt_clockstuff.c b/ports/winnt/ntpd/nt_clockstuff.c index dca4427a59..9877cf6526 100644 --- a/ports/winnt/ntpd/nt_clockstuff.c +++ b/ports/winnt/ntpd/nt_clockstuff.c @@ -214,6 +214,14 @@ void reset_winnt_time(void) { if (!SetSystemTimeAdjustment(0, TRUE)) { msyslog(LOG_ERR, "Failed to reset clock state, SetSystemTimeAdjustment(): %m"); } + /************ Added back in 2003-01-26 *****************/ + /* read the current system time, and write it back to + force CMOS update: */ + { + SYSTEMTIME st; + GetSystemTime(&st); + SetSystemTime(&st); + } } diff --git a/ports/winnt/ntpd/ntpd.dsp b/ports/winnt/ntpd/ntpd.dsp index 56b40c40a2..9cb2557511 100644 --- a/ports/winnt/ntpd/ntpd.dsp +++ b/ports/winnt/ntpd/ntpd.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /I "\\" /I "..\..\..\openssl\inc32" /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# ADD 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 ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD 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 ws2_32.lib \openssl-0.9.6g\out32dll\libeay32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "ntpd - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /FI"windows.h" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /FI"windows.h" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# ADD 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 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD 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 ws2_32.lib \openssl-0.9.6g\out32dll\libeay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/ports/winnt/ntpdate/ntpdate.dsp b/ports/winnt/ntpdate/ntpdate.dsp index a2c51e9173..9d0a24c819 100644 --- a/ports/winnt/ntpdate/ntpdate.dsp +++ b/ports/winnt/ntpdate/ntpdate.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /I "\\" /I "..\..\..\openssl\inc32" /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/ports/winnt/ntpdc/ntpdc.dsp b/ports/winnt/ntpdc/ntpdc.dsp index e4f14ad5d7..ad2efec96d 100644 --- a/ports/winnt/ntpdc/ntpdc.dsp +++ b/ports/winnt/ntpdc/ntpdc.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /I "\\" /I "..\..\..\openssl\inc32" /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/ports/winnt/ntpq/ntpq.dsp b/ports/winnt/ntpq/ntpq.dsp index e09cffea0a..9c374635f9 100644 --- a/ports/winnt/ntpq/ntpq.dsp +++ b/ports/winnt/ntpq/ntpq.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /I "\\" /I "..\..\..\openssl\inc32" /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/ports/winnt/ntptrace/ntptrace.dsp b/ports/winnt/ntptrace/ntptrace.dsp index 995b10bf1a..36127969b4 100644 --- a/ports/winnt/ntptrace/ntptrace.dsp +++ b/ports/winnt/ntptrace/ntptrace.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W4 /GX /O2 /I "." /I "..\include" /I "..\..\..\include" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /I "\\" /I "..\..\..\openssl\inc32" /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /YX"windows.h" /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "." /I "..\include" /I "..\..\..\include" /I "\openssl-0.9.6g\inc32" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__STDC__" /D "SYS_WINNT" /D "HAVE_CONFIG_H" /D _WIN32_WINNT=0x400 /FR /YX"windows.h" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe