From: Dave Hart Date: Tue, 16 Nov 2010 20:36:48 +0000 (+0000) Subject: [Bug 1727] ntp-keygen PLEN, ILEN undeclared --without-crypto. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72a62cb9fdfd68a1d92710795994fc5f0dcacd73;p=thirdparty%2Fntp.git [Bug 1727] ntp-keygen PLEN, ILEN undeclared --without-crypto. bk: 4ce2eb60wMzk6n992DApPUzTmts54Q --- diff --git a/ChangeLog b/ChangeLog index 1c863cb92b..8f477cb0fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +* [Bug 1727] ntp-keygen PLEN, ILEN undeclared --without-crypto. * Remove top-level libopts, use sntp/libopts. (4.2.7p82) 2010/11/16 Released by Harlan Stenn * [Bug 1728] from 4.2.6p3-RC11: In ntp_openssl.m4, don't add diff --git a/util/ntp-keygen.c b/util/ntp-keygen.c index 6daf6d1e2c..c6ab0fa3c1 100644 --- a/util/ntp-keygen.c +++ b/util/ntp-keygen.c @@ -157,8 +157,6 @@ u_long asn2ntp (ASN1_TIME *); extern char *optarg; /* command line argument */ char *progname; volatile int debug = 0; /* debug, not de bug */ -u_int modulus = PLEN; /* prime modulus size (bits) */ -u_int modulus2 = ILEN; /* identity modulus size (bits) */ u_int lifetime = YEAR; /* cetificate lifetime (days) */ int nkeys; /* MV keys */ time_t epoch; /* Unix epoch (seconds) since 1970 */ @@ -170,6 +168,8 @@ char *passwd1 = NULL; /* input private key password */ char *passwd2 = NULL; /* output private key password */ char filename[MAXFILENAME + 1]; /* file name */ #ifdef AUTOKEY +u_int modulus = PLEN; /* prime modulus size (bits) */ +u_int modulus2 = ILEN; /* identity modulus size (bits) */ long d0, d1, d2, d3; /* callback counters */ #endif /* AUTOKEY */