From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 Jun 2007 00:40:23 +0000 (-0400)
Subject: [Bug 858] Recent leapfile changes broke without OPENSSL
X-Git-Tag: NTP_4_2_5P48~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73230336b69c6a8959e1f8d2ec502de40d5fc4bb;p=thirdparty%2Fntp.git

[Bug 858] Recent leapfile changes broke without OPENSSL

bk: 466deb77qwCGvXNnqx7Kz97ofCLddA
---

diff --git a/ChangeLog b/ChangeLog
index b25b35cad..b03cae2d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 858] Recent leapfile changes broke without OPENSSL.
 * Use a char for DIR_SEP, not a string.
 * [Bug 850] driftfile parsing changes.
 * driftfile maintenance changes from Dave Mills.  Use clock_phi instead of
diff --git a/include/ntp_crypto.h b/include/ntp_crypto.h
index 14795e72d..2bdcb585e 100644
--- a/include/ntp_crypto.h
+++ b/include/ntp_crypto.h
@@ -1,6 +1,7 @@
 /*
  * ntp_crypto.h - definitions for cryptographic operations
  */
+
 #ifdef OPENSSL
 #include "openssl/evp.h"
 /*
@@ -102,7 +103,6 @@
 #define NTP_AUTOMAX	13	/* log2 default max session key life */
 #define KEY_REVOKE	16	/* log2 default key revoke timeout */
 #define NTP_MAXEXTEN	1024	/* maximum extension field size */
-#define	TAI_1972	10	/* initial TAI offset (s) */
 
 /*
  * The autokey structure holds the values used to authenticate key IDs.
@@ -162,7 +162,6 @@ struct cert_info {
 /*
  * Cryptographic values
  */
-extern	char	*keysdir;	/* crypto keys directory */
 extern	u_int	crypto_flags;	/* status word */
 extern	struct value hostval;	/* host name/value */
 extern	struct cert_info *cinfo; /* host certificate information */
diff --git a/include/ntpd.h b/include/ntpd.h
index 24768a149..83e146dc4 100644
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -13,9 +13,11 @@
 
 
 /* ntp_config.c */
-extern	void	getconfig	(int, char **);
 
-/* ntp_config.c */
+#define	TAI_1972	10	/* initial TAI offset (s) */
+extern	char	*keysdir;	/* crypto keys and leaptable directory */
+
+extern	void	getconfig	(int, char **);
 extern	void	ctl_clr_stats	(void);
 extern	int	ctlclrtrap	(struct sockaddr_storage *, struct interface *, int);
 extern	u_short ctlpeerstatus	(struct peer *);