From: Dave Hart <hart@ntp.org>
Date: Wed, 3 Nov 2010 21:24:43 +0000 (+0000)
Subject: Add ChangeLog entries, Windows build tweaks to Juergen Perlinger's
X-Git-Tag: NTP_4_2_7P78~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf93f3b688d0a0955577ea2bb1f022a1d9725db1;p=thirdparty%2Fntp.git

Add ChangeLog entries, Windows build tweaks to Juergen Perlinger's
  calendar refactoring and [Bug 1697]

bk: 4cd1d31bmLEuuJHg8Wcz7oxhh8SpAg
---

diff --git a/ChangeLog b/ChangeLog
index c1a6a7c45..517ac246e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 1697] filegen implementation should be improved.
+* Refactor calendar functions in terms of new common code.
 (4.2.7p77) 2010/11/03 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1692] packageinfo.sh needs to be "sourced" using ./ .
 * [Bug 1695] ntpdate takes longer than necessary.
diff --git a/configure.ac b/configure.ac
index 38c6d2bb6..e089f4678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1225,9 +1225,10 @@ case "$ac_cv_c_inline" in
 esac
 
 AC_C_CHAR_UNSIGNED		dnl CROSS_COMPILE?
-AC_CHECK_SIZEOF(signed char)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF([signed char])
+AC_CHECK_SIZEOF([short])
+AC_CHECK_SIZEOF([int])
+AC_CHECK_SIZEOF([long])
 
 AC_CHECK_TYPES([s_char])
 case "$ac_cv_c_char_unsigned$ac_cv_sizeof_signed_char$ac_cv_type_s_char" in
diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h
index aadca731f..056d91e61 100644
--- a/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@ -353,6 +353,7 @@ typedef __int32 int32_t;	/* define a typedef for int32_t */
 # define HAVE_GETCLOCK
 
 # define SIZEOF_SIGNED_CHAR	1
+# define SIZEOF_SHORT		2
 # define SIZEOF_INT		4	/* for ntp_types.h */
 
 # define HAVE_SETVBUF
diff --git a/ports/winnt/vc6/libntp.dsp b/ports/winnt/vc6/libntp.dsp
index 51d2904b7..df3ee6b33 100644
--- a/ports/winnt/vc6/libntp.dsp
+++ b/ports/winnt/vc6/libntp.dsp
@@ -318,6 +318,10 @@ SOURCE=..\..\..\lib\isc\netscope.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\libntp\ntp_calendar.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\libntp\ntp_lineedit.c
 # End Source File
 # Begin Source File
diff --git a/ports/winnt/vs2003/libntp.vcproj b/ports/winnt/vs2003/libntp.vcproj
index 56873c17e..fd65f2f33 100644
--- a/ports/winnt/vs2003/libntp.vcproj
+++ b/ports/winnt/vs2003/libntp.vcproj
@@ -1202,6 +1202,27 @@
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\..\libntp\ntp_calendar.c">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\libntp\ntp_lineedit.c">
 				<FileConfiguration
diff --git a/ports/winnt/vs2005/libntp.vcproj b/ports/winnt/vs2005/libntp.vcproj
index 0bf1955bc..b3404ae1a 100644
--- a/ports/winnt/vs2005/libntp.vcproj
+++ b/ports/winnt/vs2005/libntp.vcproj
@@ -1310,6 +1310,28 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\..\libntp\ntp_calendar.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\libntp\ntp_lineedit.c"
 				>
diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj
index 115a70e13..d8c64a3e3 100644
--- a/ports/winnt/vs2008/libntp/libntp.vcproj
+++ b/ports/winnt/vs2008/libntp/libntp.vcproj
@@ -427,6 +427,10 @@
 				RelativePath="..\..\..\..\lib\isc\netscope.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\libntp\ntp_calendar.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\libntp\ntp_lineedit.c"
 				>
@@ -849,11 +853,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h"
+				RelativePath="..\..\include\sys\time.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\sys\time.h"
+				RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h"
 				>
 			</File>
 			<File
diff --git a/sntp/configure.ac b/sntp/configure.ac
index c7e7bc8e8..410103ab7 100644
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -207,6 +207,7 @@ esac
 
 AC_C_CHAR_UNSIGNED		dnl CROSS_COMPILE?
 AC_CHECK_SIZEOF([signed char])
+AC_CHECK_SIZEOF([short])
 AC_CHECK_SIZEOF([int])
 AC_CHECK_SIZEOF([long])
 
diff --git a/sntp/tests/crypto.cpp b/sntp/tests/crypto.cpp
index ade6cfb0f..a6f89f5aa 100644
--- a/sntp/tests/crypto.cpp
+++ b/sntp/tests/crypto.cpp
@@ -31,6 +31,7 @@ TEST_F(cryptoTest, MakeMd5Mac) {
 	EXPECT_TRUE(memcmp(EXPECTED_DIGEST, actual, MD5_LENGTH) == 0);
 }
 
+#ifdef OPENSSL
 TEST_F(cryptoTest, MakeSHA1Mac) {
 	const char* PKT_DATA = "abcdefgh0123";
 	const int PKT_LEN = strlen(PKT_DATA);
@@ -51,6 +52,7 @@ TEST_F(cryptoTest, MakeSHA1Mac) {
 
 	EXPECT_TRUE(memcmp(EXPECTED_DIGEST, actual, SHA1_LENGTH) == 0);
 }
+#endif	/* OPENSSL */
 
 TEST_F(cryptoTest, VerifyCorrectMD5) {
 	const char* PKT_DATA =
@@ -70,6 +72,7 @@ TEST_F(cryptoTest, VerifyCorrectMD5) {
 	EXPECT_TRUE(auth_md5((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5));
 }
 
+#ifdef OPENSSL
 TEST_F(cryptoTest, VerifySHA1) {
 	const char* PKT_DATA =
 		"sometestdata"		// Data
@@ -87,6 +90,7 @@ TEST_F(cryptoTest, VerifySHA1) {
 
 	EXPECT_TRUE(auth_md5((char*)PKT_DATA, PKT_LEN, SHA1_LENGTH, &sha1));
 }
+#endif	/* OPENSSL */
 
 TEST_F(cryptoTest, VerifyFailure) {
 	/* We use a copy of the MD5 verification code, but modify
diff --git a/tests/libntp/a_md5encrypt.cpp b/tests/libntp/a_md5encrypt.cpp
index bcf76a0f3..93170bcf4 100644
--- a/tests/libntp/a_md5encrypt.cpp
+++ b/tests/libntp/a_md5encrypt.cpp
@@ -1,6 +1,11 @@
 #include "libntptest.h"
 
 extern "C" {
+#ifdef OPENSSL
+# include "openssl/err.h"
+# include "openssl/rand.h"
+# include "openssl/evp.h"
+#endif
 #include "ntp.h"
 #include "ntp_stdlib.h"
 };
diff --git a/tests/libntp/authkeys.cpp b/tests/libntp/authkeys.cpp
index 276b292b1..b361124b1 100644
--- a/tests/libntp/authkeys.cpp
+++ b/tests/libntp/authkeys.cpp
@@ -3,6 +3,11 @@
 #include "libntptest.h"
 
 extern "C" {
+#ifdef OPENSSL
+# include "openssl/err.h"
+# include "openssl/rand.h"
+# include "openssl/evp.h"
+#endif
 #include "ntp.h"
 #include "ntp_stdlib.h"
 };
diff --git a/tests/libntp/refnumtoa.cpp b/tests/libntp/refnumtoa.cpp
index 20260f572..75460c0b5 100644
--- a/tests/libntp/refnumtoa.cpp
+++ b/tests/libntp/refnumtoa.cpp
@@ -11,6 +11,7 @@ protected:
 	static const int UNUSED_REFCLOCK_ID = 250;
 };
 
+#ifdef REFCLOCK		/* clockname() is useless otherwise */
 TEST_F(refnumtoaTest, LocalClock) {
 	/* We test with a refclock address of type LOCALCLOCK.
 	 * with id 8
@@ -29,7 +30,9 @@ TEST_F(refnumtoaTest, LocalClock) {
 
 	EXPECT_STREQ(expected.str().c_str(), refnumtoa(&address));
 }
+#endif	/* REFCLOCK */
 
+#ifdef REFCLOCK		/* refnumtoa() is useless otherwise */
 TEST_F(refnumtoaTest, UnknownId) {
 	/* We test with a currently unused refclock ID */
 	u_int32 addr = REFCLOCK_ADDR;
@@ -46,3 +49,4 @@ TEST_F(refnumtoaTest, UnknownId) {
 
 	EXPECT_STREQ(expected.str().c_str(), refnumtoa(&address));
 }
+#endif	/* REFCLOCK */
diff --git a/tests/libntp/ssl_init.cpp b/tests/libntp/ssl_init.cpp
index 17f336cff..8812656c3 100644
--- a/tests/libntp/ssl_init.cpp
+++ b/tests/libntp/ssl_init.cpp
@@ -1,6 +1,11 @@
 #include "libntptest.h"
 
 extern "C" {
+#ifdef OPENSSL
+# include "openssl/err.h"
+# include "openssl/rand.h"
+# include "openssl/evp.h"
+#endif
 #include "ntp.h"
 };
 
@@ -23,6 +28,7 @@ TEST_F(ssl_initTest, MD5KeyTypeWithDigestLength) {
 	EXPECT_EQ(expected, digestLength);
 }
 
+#ifdef OPENSSL
 TEST_F(ssl_initTest, SHA1KeyTypeWithDigestLength) {
 	size_t digestLength;
 	size_t expected = TEST_SHA1_DIGEST_LENGTH;
@@ -30,12 +36,15 @@ TEST_F(ssl_initTest, SHA1KeyTypeWithDigestLength) {
 	EXPECT_EQ(NID_sha, keytype_from_text("SHA", &digestLength));
 	EXPECT_EQ(expected, digestLength);
 }
+#endif	/* OPENSSL */
 
 // keytype_name()
 TEST_F(ssl_initTest, MD5KeyName) {
 	EXPECT_STREQ("MD5", keytype_name(KEY_TYPE_MD5));
 }
 
+#ifdef OPENSSL
 TEST_F(ssl_initTest, SHA1KeyName) {
 	EXPECT_STREQ("SHA", keytype_name(NID_sha));
 }
+#endif	/* OPENSSL */