mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-30 02:32:46 +02:00
* 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.
This commit is contained in:
parent
73b4b2c890
commit
65077adf83
|
@ -1,6 +1,14 @@
|
||||||
|
2004-10-21 David Shaw <dshaw@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@g10code.com>
|
2004-10-21 Werner Koch <wk@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.
|
* app-openpgp.c (do_sign): Replace asprintf by direct allocation.
|
||||||
This avoids problems with missing vasprintf implementations.
|
This avoids problems with missing vasprintf implementations.
|
||||||
|
|
|
@ -824,7 +824,7 @@ verify_chv3 (app_t app,
|
||||||
|
|
||||||
if (strlen (pinvalue) < 6)
|
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);
|
" minimum length is %d\n"), 3, 6);
|
||||||
xfree (pinvalue);
|
xfree (pinvalue);
|
||||||
return gpg_error (GPG_ERR_BAD_PIN);
|
return gpg_error (GPG_ERR_BAD_PIN);
|
||||||
|
|
|
@ -1469,7 +1469,8 @@ parse_list_options(char *str)
|
||||||
|
|
||||||
/* C99 allows for non-constant initializers, but we'd like to
|
/* C99 allows for non-constant initializers, but we'd like to
|
||||||
compile everywhere, so fill in the show-sig-subpackets argument
|
compile everywhere, so fill in the show-sig-subpackets argument
|
||||||
here. */
|
here. Note that if the parse_options array changes, we'll have
|
||||||
|
to change the subscript here. */
|
||||||
lopts[12].value=&subpackets;
|
lopts[12].value=&subpackets;
|
||||||
|
|
||||||
if(parse_options(str,&opt.list_options,lopts,1))
|
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-standard-notations",VERIFY_SHOW_STD_NOTATIONS,NULL},
|
||||||
{"show-user-notations",VERIFY_SHOW_USER_NOTATIONS,NULL},
|
{"show-user-notations",VERIFY_SHOW_USER_NOTATIONS,NULL},
|
||||||
{"show-keyserver-urls",VERIFY_SHOW_KEYSERVER_URLS,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},
|
{"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL},
|
||||||
{NULL,0,NULL}
|
{NULL,0,NULL}
|
||||||
};
|
};
|
||||||
|
|
|
@ -1485,7 +1485,7 @@ check_sig_and_print( CTX c, KBNODE node )
|
||||||
|
|
||||||
m_free(p);
|
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));
|
fprintf(log_stream()," [%s]\n",trust_value_to_string(valid));
|
||||||
else
|
else
|
||||||
fputs("\n", log_stream() );
|
fputs("\n", log_stream() );
|
||||||
|
@ -1568,7 +1568,7 @@ check_sig_and_print( CTX c, KBNODE node )
|
||||||
log_info(_(" aka \"%s\""),p);
|
log_info(_(" aka \"%s\""),p);
|
||||||
m_free(p);
|
m_free(p);
|
||||||
|
|
||||||
if(opt.verify_options&VERIFY_SHOW_VALIDITY)
|
if(opt.verify_options&VERIFY_SHOW_UID_VALIDITY)
|
||||||
{
|
{
|
||||||
const char *valid;
|
const char *valid;
|
||||||
if(un->pkt->pkt.user_id->is_revoked)
|
if(un->pkt->pkt.user_id->is_revoked)
|
||||||
|
|
|
@ -272,7 +272,7 @@ struct {
|
||||||
#define VERIFY_SHOW_USER_NOTATIONS (1<<3)
|
#define VERIFY_SHOW_USER_NOTATIONS (1<<3)
|
||||||
#define VERIFY_SHOW_NOTATIONS (VERIFY_SHOW_STD_NOTATIONS|VERIFY_SHOW_USER_NOTATIONS)
|
#define VERIFY_SHOW_NOTATIONS (VERIFY_SHOW_STD_NOTATIONS|VERIFY_SHOW_USER_NOTATIONS)
|
||||||
#define VERIFY_SHOW_KEYSERVER_URLS (1<<4)
|
#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 VERIFY_SHOW_UNUSABLE_UIDS (1<<6)
|
||||||
|
|
||||||
#define KEYSERVER_INCLUDE_REVOKED (1<<0)
|
#define KEYSERVER_INCLUDE_REVOKED (1<<0)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user