[Bug 970] Lose obsolete -g flag to ntp-keygen

bk: 4756516dlhpDclnutYyvj21AMPPdzg

diff --git a/ChangeLog b/ChangeLog
index b0f4f85918ba556c9ed7cb3bc0ab586fcb9df44e..b648ce9d5ba179b6316ade646977c19636048353 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 970] Lose obsolete -g flag to ntp-keygen.
 * 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.

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 269fb586635f0b1ce899466d28a61feafa250221..c885717363e2d878cb993f855279ccfbde53788b 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  Wednesday December  5, 2007 at 01:53:56 AM EST
+ *  It has been AutoGen-ed  Wednesday December  5, 2007 at 02:18:31 AM EST
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -152,24 +152,6 @@ tSCC    zGq_Params_Name[]          = "gq-params";
 #define zGq_Params_Name      NULL
 #endif  /* OPENSSL */
 
-/*
- *  Gq_Keys option description:
- */
-#ifdef OPENSSL
-tSCC    zGq_KeysText[] =
-        "update GQ keys";
-tSCC    zGq_Keys_NAME[]            = "GQ_KEYS";
-tSCC    zGq_Keys_Name[]            = "gq-keys";
-#define GQ_KEYS_FLAGS       (OPTST_DISABLED)
-
-#else   /* disable Gq_Keys */
-#define VALUE_OPT_GQ_KEYS NO_EQUIVALENT
-#define GQ_KEYS_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zGq_KeysText       NULL
-#define zGq_Keys_NAME      NULL
-#define zGq_Keys_Name      NULL
-#endif  /* OPENSSL */
-
 /*
  *  Host_Key option description:
  */
@@ -553,20 +535,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zGq_ParamsText, zGq_Params_NAME, zGq_Params_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 5, VALUE_OPT_GQ_KEYS,
-     /* equiv idx, value */ 5, VALUE_OPT_GQ_KEYS,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ GQ_KEYS_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zGq_KeysText, zGq_Keys_NAME, zGq_Keys_Name,
-     /* disablement strs */ NULL, NULL },
-
-  {  /* entry idx, value */ 6, VALUE_OPT_HOST_KEY,
-     /* equiv idx, value */ 6, VALUE_OPT_HOST_KEY,
+  {  /* entry idx, value */ 5, VALUE_OPT_HOST_KEY,
+     /* equiv idx, value */ 5, VALUE_OPT_HOST_KEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ HOST_KEY_FLAGS, 0,
@@ -577,8 +547,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zHost_KeyText, zHost_Key_NAME, zHost_Key_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 7, VALUE_OPT_IFFKEY,
-     /* equiv idx, value */ 7, VALUE_OPT_IFFKEY,
+  {  /* entry idx, value */ 6, VALUE_OPT_IFFKEY,
+     /* equiv idx, value */ 6, VALUE_OPT_IFFKEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ IFFKEY_FLAGS, 0,
@@ -589,8 +559,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zIffkeyText, zIffkey_NAME, zIffkey_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 8, VALUE_OPT_ISSUER_NAME,
-     /* equiv idx, value */ 8, VALUE_OPT_ISSUER_NAME,
+  {  /* entry idx, value */ 7, VALUE_OPT_ISSUER_NAME,
+     /* equiv idx, value */ 7, VALUE_OPT_ISSUER_NAME,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ ISSUER_NAME_FLAGS, 0,
@@ -601,8 +571,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zIssuer_NameText, zIssuer_Name_NAME, zIssuer_Name_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 9, VALUE_OPT_MD5KEY,
-     /* equiv idx, value */ 9, VALUE_OPT_MD5KEY,
+  {  /* entry idx, value */ 8, VALUE_OPT_MD5KEY,
+     /* equiv idx, value */ 8, VALUE_OPT_MD5KEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MD5KEY_FLAGS, 0,
@@ -613,8 +583,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zMd5keyText, zMd5key_NAME, zMd5key_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 10, VALUE_OPT_MODULUS,
-     /* equiv idx, value */ 10, VALUE_OPT_MODULUS,
+  {  /* entry idx, value */ 9, VALUE_OPT_MODULUS,
+     /* equiv idx, value */ 9, VALUE_OPT_MODULUS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MODULUS_FLAGS, 0,
@@ -625,8 +595,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zModulusText, zModulus_NAME, zModulus_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 11, VALUE_OPT_PVT_CERT,
-     /* equiv idx, value */ 11, VALUE_OPT_PVT_CERT,
+  {  /* entry idx, value */ 10, VALUE_OPT_PVT_CERT,
+     /* equiv idx, value */ 10, VALUE_OPT_PVT_CERT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PVT_CERT_FLAGS, 0,
@@ -637,8 +607,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPvt_CertText, zPvt_Cert_NAME, zPvt_Cert_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 12, VALUE_OPT_PVT_PASSWD,
-     /* equiv idx, value */ 12, VALUE_OPT_PVT_PASSWD,
+  {  /* entry idx, value */ 11, VALUE_OPT_PVT_PASSWD,
+     /* equiv idx, value */ 11, VALUE_OPT_PVT_PASSWD,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PVT_PASSWD_FLAGS, 0,
@@ -649,8 +619,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPvt_PasswdText, zPvt_Passwd_NAME, zPvt_Passwd_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 13, VALUE_OPT_GET_PVT_PASSWD,
-     /* equiv idx, value */ 13, VALUE_OPT_GET_PVT_PASSWD,
+  {  /* entry idx, value */ 12, VALUE_OPT_GET_PVT_PASSWD,
+     /* equiv idx, value */ 12, VALUE_OPT_GET_PVT_PASSWD,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ GET_PVT_PASSWD_FLAGS, 0,
@@ -661,8 +631,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zGet_Pvt_PasswdText, zGet_Pvt_Passwd_NAME, zGet_Pvt_Passwd_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 14, VALUE_OPT_SIGN_KEY,
-     /* equiv idx, value */ 14, VALUE_OPT_SIGN_KEY,
+  {  /* entry idx, value */ 13, VALUE_OPT_SIGN_KEY,
+     /* equiv idx, value */ 13, VALUE_OPT_SIGN_KEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SIGN_KEY_FLAGS, 0,
@@ -673,8 +643,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zSign_KeyText, zSign_Key_NAME, zSign_Key_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 15, VALUE_OPT_SUBJECT_NAME,
-     /* equiv idx, value */ 15, VALUE_OPT_SUBJECT_NAME,
+  {  /* entry idx, value */ 14, VALUE_OPT_SUBJECT_NAME,
+     /* equiv idx, value */ 14, VALUE_OPT_SUBJECT_NAME,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SUBJECT_NAME_FLAGS, 0,
@@ -685,8 +655,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zSubject_NameText, zSubject_Name_NAME, zSubject_Name_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 16, VALUE_OPT_TRUSTED_CERT,
-     /* equiv idx, value */ 16, VALUE_OPT_TRUSTED_CERT,
+  {  /* entry idx, value */ 15, VALUE_OPT_TRUSTED_CERT,
+     /* equiv idx, value */ 15, VALUE_OPT_TRUSTED_CERT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ TRUSTED_CERT_FLAGS, 0,
@@ -697,8 +667,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zTrusted_CertText, zTrusted_Cert_NAME, zTrusted_Cert_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 17, VALUE_OPT_MV_PARAMS,
-     /* equiv idx, value */ 17, VALUE_OPT_MV_PARAMS,
+  {  /* entry idx, value */ 16, VALUE_OPT_MV_PARAMS,
+     /* equiv idx, value */ 16, VALUE_OPT_MV_PARAMS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MV_PARAMS_FLAGS, 0,
@@ -709,8 +679,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zMv_ParamsText, zMv_Params_NAME, zMv_Params_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 18, VALUE_OPT_MV_KEYS,
-     /* equiv idx, value */ 18, VALUE_OPT_MV_KEYS,
+  {  /* entry idx, value */ 17, VALUE_OPT_MV_KEYS,
+     /* equiv idx, value */ 17, VALUE_OPT_MV_KEYS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MV_KEYS_FLAGS, 0,
@@ -852,7 +822,7 @@ tOptions ntp_keygenOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    24 /* full option count */, 19 /* user option count */
+    23 /* full option count */, 18 /* user option count */
 };
 
 /*

diff --git a/util/ntp-keygen-opts.def b/util/ntp-keygen-opts.def
index 9495d9b9d5544110bb9dadd13ed00afa56034f27..61cf2721e587843e7965577a91eed9479a6a0f0b 100644 (file)
--- a/util/ntp-keygen-opts.def
+++ b/util/ntp-keygen-opts.def
@@ -58,18 +58,6 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    value     = g;
-    name      = gq-keys;
-    ifdef     = OPENSSL;
-    descrip   = "update GQ keys";
-    doc = <<-  _EndOfDoc_
-       Generate keys for the GQ identification scheme using the existing
-       GQ parameters.  If the GQ parameters do not yet exist, create
-       them first.
-       _EndOfDoc_;
-};
-
 flag = {
     value     = H;
     name      = host-key;

diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 81aa44de9908a7921d64abb5d39a8310b3f3a91a..4f586f9596f6f4f57739dd4b3602910307aba5e2 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  Wednesday December  5, 2007 at 01:53:55 AM EST
+ *  It has been AutoGen-ed  Wednesday December  5, 2007 at 02:18:30 AM EST
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -57,28 +57,27 @@ typedef enum {
         INDEX_OPT_SET_DEBUG_LEVEL  =  2,
         INDEX_OPT_ID_KEY           =  3,
         INDEX_OPT_GQ_PARAMS        =  4,
-        INDEX_OPT_GQ_KEYS          =  5,
-        INDEX_OPT_HOST_KEY         =  6,
-        INDEX_OPT_IFFKEY           =  7,
-        INDEX_OPT_ISSUER_NAME      =  8,
-        INDEX_OPT_MD5KEY           =  9,
-        INDEX_OPT_MODULUS          = 10,
-        INDEX_OPT_PVT_CERT         = 11,
-        INDEX_OPT_PVT_PASSWD       = 12,
-        INDEX_OPT_GET_PVT_PASSWD   = 13,
-        INDEX_OPT_SIGN_KEY         = 14,
-        INDEX_OPT_SUBJECT_NAME     = 15,
-        INDEX_OPT_TRUSTED_CERT     = 16,
-        INDEX_OPT_MV_PARAMS        = 17,
-        INDEX_OPT_MV_KEYS          = 18,
-        INDEX_OPT_VERSION          = 19,
-        INDEX_OPT_HELP             = 20,
-        INDEX_OPT_MORE_HELP        = 21,
-        INDEX_OPT_SAVE_OPTS        = 22,
-        INDEX_OPT_LOAD_OPTS        = 23
+        INDEX_OPT_HOST_KEY         =  5,
+        INDEX_OPT_IFFKEY           =  6,
+        INDEX_OPT_ISSUER_NAME      =  7,
+        INDEX_OPT_MD5KEY           =  8,
+        INDEX_OPT_MODULUS          =  9,
+        INDEX_OPT_PVT_CERT         = 10,
+        INDEX_OPT_PVT_PASSWD       = 11,
+        INDEX_OPT_GET_PVT_PASSWD   = 12,
+        INDEX_OPT_SIGN_KEY         = 13,
+        INDEX_OPT_SUBJECT_NAME     = 14,
+        INDEX_OPT_TRUSTED_CERT     = 15,
+        INDEX_OPT_MV_PARAMS        = 16,
+        INDEX_OPT_MV_KEYS          = 17,
+        INDEX_OPT_VERSION          = 18,
+        INDEX_OPT_HELP             = 19,
+        INDEX_OPT_MORE_HELP        = 20,
+        INDEX_OPT_SAVE_OPTS        = 21,
+        INDEX_OPT_LOAD_OPTS        = 22
 } teOptIndex;
 
-#define OPTION_CT    24
+#define OPTION_CT    23
 #define NTP_KEYGEN_VERSION       "4.2.5p104"
 #define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p104"
 
@@ -127,10 +126,6 @@ typedef enum {
 #  warning undefining GQ_PARAMS due to option name conflict
 #  undef   GQ_PARAMS
 # endif
-# ifdef    GQ_KEYS
-#  warning undefining GQ_KEYS due to option name conflict
-#  undef   GQ_KEYS
-# endif
 # ifdef    HOST_KEY
 #  warning undefining HOST_KEY due to option name conflict
 #  undef   HOST_KEY
@@ -189,7 +184,6 @@ typedef enum {
 # undef SET_DEBUG_LEVEL
 # undef ID_KEY
 # undef GQ_PARAMS
-# undef GQ_KEYS
 # undef HOST_KEY
 # undef IFFKEY
 # undef ISSUER_NAME
@@ -224,9 +218,6 @@ typedef enum {
 #define VALUE_OPT_GQ_PARAMS      'G'
 #endif /* OPENSSL */
 #ifdef OPENSSL
-#define VALUE_OPT_GQ_KEYS        'g'
-#endif /* OPENSSL */
-#ifdef OPENSSL
 #define VALUE_OPT_HOST_KEY       'H'
 #endif /* OPENSSL */
 #ifdef OPENSSL

diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index c6fc671b97b1b796afbd09a2e2f32c0fa480f950..1694253a1f262b6c47053059a7c025cf9d13f65d 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  Wednesday December  5, 2007 at 01:53:58 AM EST
+# It has been AutoGen-ed  Wednesday December  5, 2007 at 02:18:33 AM EST
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -25,7 +25,6 @@ This software is released under a specialized copyright license.
 * ntp-keygen certificate::            certificate option (-c)
 * ntp-keygen debug-level::            debug-level option (-d)
 * ntp-keygen get-pvt-passwd::         get-pvt-passwd option (-q)
-* ntp-keygen gq-keys::                gq-keys option (-g)
 * ntp-keygen gq-params::              gq-params option (-G)
 * ntp-keygen host-key::               host-key option (-H)
 * ntp-keygen id-key::                 id-key option (-e)
@@ -184,22 +183,6 @@ must be compiled in by defining @code{OPENSSL} during the compilation.
 Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist.
 
-@node ntp-keygen gq-keys
-@subsection gq-keys option (-g)
-@cindex ntp-keygen-gq-keys
-
-This is the ``update gq keys'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{OPENSSL} during the compilation.
-@end itemize
-
-Generate keys for the GQ identification scheme using the existing
-GQ parameters.  If the GQ parameters do not yet exist, create
-them first.
-
 @node ntp-keygen host-key
 @subsection host-key option (-H)
 @cindex ntp-keygen-host-key

diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 2a16f19f74b5afd8db06516ede1f27470d40b254..e74ce3d64928db81a8a4d96f58c6b58d7171c5d9 100644 (file)
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
 .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  Wednesday December  5, 2007 at 01:53:57 AM EST
+.\"  It has been AutoGen-ed  Wednesday December  5, 2007 at 02:18:32 AM EST
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -56,13 +56,6 @@ Generate GQ parameters and keys.
 Generate parameters and keys for the GQ identification scheme,
 obsoleting any that may exist.
 .TP
-.BR \-g ", " \--gq-keys
-update GQ keys.
-.sp
-Generate keys for the GQ identification scheme using the existing
-GQ parameters.  If the GQ parameters do not yet exist, create
-them first.
-.TP
 .BR \-H ", " \--host-key
 generate RSA host key.
 .sp

diff --git a/util/ntp-keygen.c b/util/ntp-keygen.c
index cf40e7d2a1c2848b861e987ff3d32ee250fc06ed..5f8cb3de1ebe68970ec50771ef32194e93dce645 100644 (file)
--- a/util/ntp-keygen.c
+++ b/util/ntp-keygen.c
@@ -225,7 +225,6 @@ main(
        int     hostkey = 0;    /* generate RSA keys */
        int     iffkey = 0;     /* generate IFF keys */
        int     gqpar = 0;      /* generate GQ keys */
-       int     gqkey = 0;      /* not used */
        int     mvpar = 0;      /* generate MV parameters */
        int     mvkey = 0;      /* update MV keys */
        char    *sign = NULL;   /* sign key */
@@ -299,9 +298,6 @@ main(
        if (HAVE_OPT( GQ_PARAMS ))
            gqpar++;
 
-       if (HAVE_OPT( GQ_KEYS ))
-           gqkey++;                    /* not used */
-
        if (HAVE_OPT( HOST_KEY ))
            hostkey++;