The -e flag to ntp-keygen can write GQ keys now, too.

bk: 47564be3iIWb3UKp9S3nutFb2Pc2pQ

diff --git a/ChangeLog b/ChangeLog
index 2cf27bea95fff364917348b734ec7768dc7dce12..b0f4f85918ba556c9ed7cb3bc0ab586fcb9df44e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* The -e flag to ntp-keygen can write GQ keys now, too.
 * ntp_proto.c: sys_survivors and hpoll cleanup from Dave Mills.
 * ntp_loopfilter.c: sys_poll cleanup from Dave Mills.
 * refclock_wwv.c: maximum-likelihood digit and DSYNC fixes from Dave Mills.

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 866f4e964df3d51211956211dc0fb7098c89cd4e..269fb586635f0b1ce899466d28a61feafa250221 100644 (file)
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  Tuesday November 27, 2007 at 06:44:46 AM EST
+ *  It has been AutoGen-ed  Wednesday December  5, 2007 at 01:53:56 AM EST
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -121,7 +121,7 @@ tSCC    zSet_Debug_Level_Name[]    = "set-debug-level";
  */
 #ifdef OPENSSL
 tSCC    zId_KeyText[] =
-        "Write identity keys";
+        "Write IFF or GQ identity keys";
 tSCC    zId_Key_NAME[]             = "ID_KEY";
 tSCC    zId_Key_Name[]             = "id-key";
 #define ID_KEY_FLAGS       (OPTST_DISABLED)

diff --git a/util/ntp-keygen-opts.def b/util/ntp-keygen-opts.def
index e7321d583c86833f0577fca65bf09ee1171f3146..9495d9b9d5544110bb9dadd13ed00afa56034f27 100644 (file)
--- a/util/ntp-keygen-opts.def
+++ b/util/ntp-keygen-opts.def
@@ -16,8 +16,8 @@ include        = '#include <stdlib.h>';
 #include       version.def
 
 flag = {
-    name      = certificate;
     value     = c;
+    name      = certificate;
     arg-type  = string;
     arg-name  = scheme;
     ifdef     = OPENSSL;
@@ -37,19 +37,19 @@ flag = {
 #include       debug-opt.def
 
 flag = {
-    name      = id-key;
     value     = e;
+    name      = id-key;
     ifdef     = OPENSSL;
-    descrip   = "Write identity keys";
+    descrip   = "Write IFF or GQ identity keys";
     doc = <<-  _EndOfDoc_
-       Write the IFF client keys to the standard output.  This is
+       Write the IFF or GQ client keys to the standard output.  This is
        intended for automatic key distribution by mail.
        _EndOfDoc_;
 };
 
 flag = {
-    name      = gq-params;
     value     = G;
+    name      = gq-params;
     ifdef     = OPENSSL;
     descrip   = "Generate GQ parameters and keys";
     doc = <<-  _EndOfDoc_
@@ -59,8 +59,8 @@ flag = {
 };
 
 flag = {
-    name      = gq-keys;
     value     = g;
+    name      = gq-keys;
     ifdef     = OPENSSL;
     descrip   = "update GQ keys";
     doc = <<-  _EndOfDoc_
@@ -71,8 +71,8 @@ flag = {
 };
 
 flag = {
-    name      = host-key;
     value     = H;
+    name      = host-key;
     ifdef     = OPENSSL;
     descrip   = "generate RSA host key";
     doc = <<-  _EndOfDoc_
@@ -81,8 +81,8 @@ flag = {
 };
 
 flag = {
-    name      = iffkey;
     value     = I;
+    name      = iffkey;
     ifdef     = OPENSSL;
     descrip   = "generate IFF parameters";
     doc = <<-  _EndOfDoc_
@@ -92,8 +92,8 @@ flag = {
 };
 
 flag = {
-    name      = issuer-name;
     value     = i;
+    name      = issuer-name;
     ifdef     = OPENSSL;
     arg-type  = string;
     arg-name  = issuer-name;
@@ -105,8 +105,8 @@ flag = {
 };
 
 flag = {
-    name      = md5key;
     value     = M;
+    name      = md5key;
     descrip   = "generate MD5 keys";
     doc = <<-  _EndOfDoc_
        Generate MD5 keys, obsoleting any that may exist.
@@ -114,8 +114,8 @@ flag = {
 };
 
 flag = {
-    name      = modulus;
     value     = m;
+    name      = modulus;
     arg-type  = number;
     arg-name  = modulus;
     arg-range = '256->2048';
@@ -127,8 +127,8 @@ flag = {
 };
 
 flag = {
-    name      = pvt-cert;
     value     = P;
+    name      = pvt-cert;
     ifdef     = OPENSSL;
     descrip   = "generate PC private certificate";
     doc = <<-  _EndOfDoc_
@@ -138,8 +138,8 @@ flag = {
 };
 
 flag = {
-    name      = pvt-passwd;
     value     = p;
+    name      = pvt-passwd;
     ifdef     = OPENSSL;
     arg-type  = string;
     arg-name  = passwd;
@@ -151,8 +151,8 @@ flag = {
 };
 
 flag = {
-    name      = get-pvt-passwd;
     value     = q;
+    name      = get-pvt-passwd;
     ifdef     = OPENSSL;
     arg-type  = string;
     arg-name  = passwd;
@@ -163,8 +163,8 @@ flag = {
 };
 
 flag = {
-    name      = sign-key;
     value     = S;
+    name      = sign-key;
     arg-type  = string;
     arg-name  = sign;
     ifdef     = OPENSSL;
@@ -177,8 +177,8 @@ flag = {
 };
 
 flag = {
-    name      = subject-name;
     value     = s;
+    name      = subject-name;
     arg-type  = string;
     arg-name  = host;
     ifdef     = OPENSSL;
@@ -190,8 +190,8 @@ flag = {
 };
 
 flag = {
-    name      = trusted-cert;
     value     = T;
+    name      = trusted-cert;
     ifdef     = OPENSSL;
     descrip   = "trusted certificate (TC scheme)";
     doc = <<-  _EndOfDoc_
@@ -201,8 +201,8 @@ flag = {
 };
 
 flag = {
-    name      = mv-params;
     value     = V;
+    name      = mv-params;
     arg-type  = number;
     arg-name  = num;
     ifdef     = OPENSSL;
@@ -214,8 +214,8 @@ flag = {
 };
 
 flag = {
-    name      = mv-keys;
     value     = v;
+    name      = mv-keys;
     arg-type  = number;
     arg-name  = num;
     ifdef     = OPENSSL;

diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index f61d285f2393c31991763fe9d1ce1fda22628dd1..81aa44de9908a7921d64abb5d39a8310b3f3a91a 100644 (file)
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  Tuesday November 27, 2007 at 06:44:45 AM EST
+ *  It has been AutoGen-ed  Wednesday December  5, 2007 at 01:53:55 AM EST
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *

diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index 8284f8eaa88f7de601b5050be21c2037bbf49fc2..c6fc671b97b1b796afbd09a2e2f32c0fa480f950 100644 (file)
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  Tuesday November 27, 2007 at 06:44:48 AM EST
+# It has been AutoGen-ed  Wednesday December  5, 2007 at 01:53:58 AM EST
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -90,7 +90,7 @@ or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/util/.ntprc
+ - reading file /deacon/backroom/ntp-dev/util/.ntprc
  - examining environment variables named NTP_KEYGEN_*
 
 If there is no new host key, look for an existing one.
@@ -158,7 +158,7 @@ but each overrides the previous value(s).
 @subsection id-key option (-e)
 @cindex ntp-keygen-id-key
 
-This is the ``write identity keys'' option.
+This is the ``write iff or gq identity keys'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -166,7 +166,7 @@ This option has some usage constraints.  It:
 must be compiled in by defining @code{OPENSSL} during the compilation.
 @end itemize
 
-Write the IFF client keys to the standard output.  This is
+Write the IFF or GQ client keys to the standard output.  This is
 intended for automatic key distribution by mail.
 
 @node ntp-keygen gq-params

diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 5afada7fcfe3a977fadcf1685c1b514ea5e01f0f..2a16f19f74b5afd8db06516ede1f27470d40b254 100644 (file)
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2007-11-27 "(ntp 4.2.5p104)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2007-12-05 "(ntp 4.2.5p104)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  Tuesday November 27, 2007 at 06:44:47 AM EST
+.\"  It has been AutoGen-ed  Wednesday December  5, 2007 at 01:53:57 AM EST
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -45,9 +45,9 @@ Set the output debugging level.  Can be supplied multiple times,
 but each overrides the previous value(s).
 .TP
 .BR \-e ", " \--id-key
-Write identity keys.
+Write IFF or GQ identity keys.
 .sp
-Write the IFF client keys to the standard output.  This is
+Write the IFF or GQ client keys to the standard output.  This is
 intended for automatic key distribution by mail.
 .TP
 .BR \-G ", " \--gq-params