gnupg/g10 (ChangeLog app-openpgp.c g10.c mainproc.c options.h)

[cvs user dshaw]

    Date: Thursday, October 21, 2004 @ 21:18:48
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog app-openpgp.c g10.c mainproc.c options.h

* options.h, g10.c (main), mainproc.c (check_sig_and_print): Rename
verify-option show-validity to show-uid-validity to match the similar
list-option.

* app-openpgp.c (verify_chv3): Fix typo.


---------------+
 ChangeLog     |   10 +++++++++-
 app-openpgp.c |    4 ++--
 g10.c         |    7 ++++---
 mainproc.c    |    4 ++--
 options.h     |    2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.626 gnupg/g10/ChangeLog:1.627
--- gnupg/g10/ChangeLog:1.626	Thu Oct 21 18:56:22 2004
+++ gnupg/g10/ChangeLog	Thu Oct 21 21:18:47 2004
@@ -1,6 +1,14 @@
+2004-10-21  David Shaw  <dshaw at jabberwocky.com>
+
+	* options.h, g10.c (main), mainproc.c (check_sig_and_print):
+	Rename verify-option show-validity to show-uid-validity to match
+	the similar list-option.
+
+	* app-openpgp.c (verify_chv3): Fix typo.
+
 2004-10-21  Werner Koch  <wk at g10code.com>
 
-	* app-common.h (app_openpgp_storekey: Add prototype.
+	* app-common.h (app_openpgp_storekey): Add prototype.
 
 	* app-openpgp.c (do_sign): Replace asprintf by direct allocation.
 	This avoids problems with missing vasprintf implementations.
Index: gnupg/g10/app-openpgp.c
diff -u gnupg/g10/app-openpgp.c:1.17 gnupg/g10/app-openpgp.c:1.18
--- gnupg/g10/app-openpgp.c:1.17	Thu Oct 21 18:56:22 2004
+++ gnupg/g10/app-openpgp.c	Thu Oct 21 21:18:47 2004
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: app-openpgp.c,v 1.17 2004/10/21 16:56:22 wk Exp $
+ * $Id: app-openpgp.c,v 1.18 2004/10/21 19:18:47 dshaw Exp $
  */
 
 #include <config.h>
@@ -824,7 +824,7 @@
 
       if (strlen (pinvalue) < 6)
         {
-          log_error (_("prassphrase (CHV%d) is too short;"
+          log_error (_("passphrase (CHV%d) is too short;"
                        " minimum length is %d\n"), 3, 6);
           xfree (pinvalue);
           return gpg_error (GPG_ERR_BAD_PIN);
Index: gnupg/g10/g10.c
diff -u gnupg/g10/g10.c:1.286 gnupg/g10/g10.c:1.287
--- gnupg/g10/g10.c:1.286	Thu Oct 21 03:10:49 2004
+++ gnupg/g10/g10.c	Thu Oct 21 21:18:47 2004
@@ -1468,8 +1468,9 @@
     };
 
   /* C99 allows for non-constant initializers, but we'd like to
-  compile everywhere, so fill in the show-sig-subpackets argument
-  here. */
+     compile everywhere, so fill in the show-sig-subpackets argument
+     here.  Note that if the parse_options array changes, we'll have
+     to change the subscript here. */
   lopts[12].value=&subpackets;
 
   if(parse_options(str,&opt.list_options,lopts,1))
@@ -2328,7 +2329,7 @@
 		  {"show-standard-notations",VERIFY_SHOW_STD_NOTATIONS,NULL},
 		  {"show-user-notations",VERIFY_SHOW_USER_NOTATIONS,NULL},
 		  {"show-keyserver-urls",VERIFY_SHOW_KEYSERVER_URLS,NULL},
-		  {"show-validity",VERIFY_SHOW_VALIDITY,NULL},
+		  {"show-uid-validity",VERIFY_SHOW_UID_VALIDITY,NULL},
 		  {"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL},
 		  {NULL,0,NULL}
 		};
Index: gnupg/g10/mainproc.c
diff -u gnupg/g10/mainproc.c:1.160 gnupg/g10/mainproc.c:1.161
--- gnupg/g10/mainproc.c:1.160	Mon Oct 11 23:08:37 2004
+++ gnupg/g10/mainproc.c	Thu Oct 21 21:18:47 2004
@@ -1485,7 +1485,7 @@
 
 	    m_free(p);
 
-	    if(opt.verify_options&VERIFY_SHOW_VALIDITY)
+	    if(opt.verify_options&VERIFY_SHOW_UID_VALIDITY)
 	      fprintf(log_stream()," [%s]\n",trust_value_to_string(valid));
 	    else
 	      fputs("\n", log_stream() );
@@ -1568,7 +1568,7 @@
 		log_info(_("                aka \"%s\""),p);
 		m_free(p);
 
-		if(opt.verify_options&VERIFY_SHOW_VALIDITY)
+		if(opt.verify_options&VERIFY_SHOW_UID_VALIDITY)
 		  {
 		    const char *valid;
 		    if(un->pkt->pkt.user_id->is_revoked)
Index: gnupg/g10/options.h
diff -u gnupg/g10/options.h:1.125 gnupg/g10/options.h:1.126
--- gnupg/g10/options.h:1.125	Wed Oct 13 17:34:52 2004
+++ gnupg/g10/options.h	Thu Oct 21 21:18:47 2004
@@ -272,7 +272,7 @@
 #define VERIFY_SHOW_USER_NOTATIONS       (1<<3)
 #define VERIFY_SHOW_NOTATIONS (VERIFY_SHOW_STD_NOTATIONS|VERIFY_SHOW_USER_NOTATIONS)
 #define VERIFY_SHOW_KEYSERVER_URLS       (1<<4)
-#define VERIFY_SHOW_VALIDITY             (1<<5)
+#define VERIFY_SHOW_UID_VALIDITY         (1<<5)
 #define VERIFY_SHOW_UNUSABLE_UIDS        (1<<6)
 
 #define KEYSERVER_INCLUDE_REVOKED        (1<<0)