mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* plaintext.c: Copyright.
* encode.c (encode_simple): Show cipher with --verbose. * options.h, g10.c (main), keyedit.c (sign_keys): Add --ask-cert-level option to enable cert level prompts during sigs. Defaults to on. Simplify --default-cert-check-level to --default-cert-level. If ask-cert-level is off, or batch is on, use the default-cert-level as the cert level. * options.h, g10.c (main), trustdb.c (mark_usable_uid_certs): Simplify --min-cert-check-level to --min-cert-level.
This commit is contained in:
parent
be94975af6
commit
a84fe549da
7 changed files with 201 additions and 172 deletions
|
@ -761,8 +761,8 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
|
|||
;
|
||||
else
|
||||
{
|
||||
if(opt.batch)
|
||||
class=0x10+opt.def_cert_check_level;
|
||||
if(opt.batch || !opt.ask_cert_level)
|
||||
class=0x10+opt.def_cert_level;
|
||||
else
|
||||
{
|
||||
char *answer;
|
||||
|
@ -773,13 +773,13 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
|
|||
"answer, enter \"0\".\n"));
|
||||
tty_printf("\n");
|
||||
tty_printf(_(" (0) I will not answer.%s\n"),
|
||||
opt.def_cert_check_level==0?" (default)":"");
|
||||
opt.def_cert_level==0?" (default)":"");
|
||||
tty_printf(_(" (1) I have not checked at all.%s\n"),
|
||||
opt.def_cert_check_level==1?" (default)":"");
|
||||
opt.def_cert_level==1?" (default)":"");
|
||||
tty_printf(_(" (2) I have done casual checking.%s\n"),
|
||||
opt.def_cert_check_level==2?" (default)":"");
|
||||
opt.def_cert_level==2?" (default)":"");
|
||||
tty_printf(_(" (3) I have done very careful checking.%s\n"),
|
||||
opt.def_cert_check_level==3?" (default)":"");
|
||||
opt.def_cert_level==3?" (default)":"");
|
||||
tty_printf("\n");
|
||||
|
||||
while(class==0)
|
||||
|
@ -787,7 +787,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
|
|||
answer = cpr_get("sign_uid.class",_("Your selection? "
|
||||
"(enter '?' for more information): "));
|
||||
if(answer[0]=='\0')
|
||||
class=0x10+opt.def_cert_check_level; /* Default */
|
||||
class=0x10+opt.def_cert_level; /* Default */
|
||||
else if(ascii_strcasecmp(answer,"0")==0)
|
||||
class=0x10; /* Generic */
|
||||
else if(ascii_strcasecmp(answer,"1")==0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue