[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Mon Jun 11 17:43:54 PDT 2007


#### ChangeSet ####
2007-06-11 20:40:23-04:00, stenn at deacon.udel.edu 
  [Bug 858] Recent leapfile changes broke without OPENSSL

==== ChangeLog ====
2007-06-11 20:40:15-04:00, stenn at deacon.udel.edu +1 -0
  [Bug 858] Recent leapfile changes broke without OPENSSL

--- 1.66/ChangeLog	2007-06-10 03:25:11 -04:00
+++ 1.67/ChangeLog	2007-06-11 20:40:15 -04:00
@@ -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

==== include/ntp_crypto.h ====
2007-06-11 20:40:15-04:00, stenn at deacon.udel.edu +1 -2
  [Bug 858] Recent leapfile changes broke without OPENSSL

--- 1.38/include/ntp_crypto.h	2005-10-22 00:22:40 -04:00
+++ 1.39/include/ntp_crypto.h	2007-06-11 20:40:15 -04:00
@@ -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 */

==== include/ntpd.h ====
2007-06-11 20:40:15-04:00, stenn at deacon.udel.edu +4 -2
  [Bug 858] Recent leapfile changes broke without OPENSSL

--- 1.101/include/ntpd.h	2007-06-10 03:24:38 -04:00
+++ 1.102/include/ntpd.h	2007-06-11 20:40:15 -04:00
@@ -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 *);


More information about the bk-ntp-dev-send mailing list