diff options
| -rw-r--r-- | g10/ChangeLog | 10 | ||||
| -rw-r--r-- | g10/app-openpgp.c | 2 | ||||
| -rw-r--r-- | g10/g10.c | 7 | ||||
| -rw-r--r-- | g10/mainproc.c | 4 | ||||
| -rw-r--r-- | g10/options.h | 2 |
5 files changed, 17 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 72604ae62..2a1b8719e 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,6 +1,14 @@ +2004-10-21 David Shaw <[email protected]> + + * 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 <[email protected]> - * 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. diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c index 11be93e28..f73b4f946 100644 --- a/g10/app-openpgp.c +++ b/g10/app-openpgp.c @@ -824,7 +824,7 @@ verify_chv3 (app_t app, 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); @@ -1468,8 +1468,9 @@ parse_list_options(char *str) }; /* 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 @@ main( int argc, char **argv ) {"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} }; diff --git a/g10/mainproc.c b/g10/mainproc.c index 138a85542..67f3d74a3 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1485,7 +1485,7 @@ check_sig_and_print( CTX c, KBNODE node ) 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 @@ check_sig_and_print( CTX c, KBNODE node ) 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) diff --git a/g10/options.h b/g10/options.h index 720b70a5c..66dfb80d0 100644 --- a/g10/options.h +++ b/g10/options.h @@ -272,7 +272,7 @@ struct { #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) |