[Bug 858] Recent leapfile changes broke without OPENSSL

bk: 466deb77qwCGvXNnqx7Kz97ofCLddA

diff --git a/ChangeLog b/ChangeLog
index b25b35cad3df5eede7fd0cba7371958a21d72ea9..b03cae2d92c3c830856b0091f970e6ffdfa1e7d5 100644 (file)
--- 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 14795e72dfbfde71377f72491b91961d81cd0ee0..2bdcb585ee403e469d441ac49d0ea0b6090614ff 100644 (file)
--- 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 24768a1490f9d4bf7ab2f10c8aa850215694c11b..83e146dc4c716d291dd26ab749efc6b6897eda2f 100644 (file)
--- 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 *);