mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Add new SVN only file README.maint
doc/ * gpg.texi (GPG Configuration): Document envvar LANGUAGE. (GPG Configuration Options): Document show-primary-uid-only. g10/ * gpg.c (main): Add verify option show-primary-uid-only. * options.h (VERIFY_SHOW_PRIMARY_UID_ONLY): New. * mainproc.c (check_sig_and_print): Implement it. * encr-data.c (decrypt_data): Correctly test for unknown algorithm. * import.c (check_prefs): Ditto. * keyedit.c (show_prefs): Ditto. * mainproc.c (proc_symkey_enc): Ditto.
This commit is contained in:
parent
1b302e1fdf
commit
f6243073a8
14 changed files with 116 additions and 27 deletions
14
g10/import.c
14
g10/import.c
|
@ -603,11 +603,14 @@ check_prefs(KBNODE keyblock)
|
|||
{
|
||||
if (openpgp_cipher_test_algo (prefs->value))
|
||||
{
|
||||
const char *algo = gcry_cipher_algo_name (prefs->value);
|
||||
const char *algo =
|
||||
(gcry_cipher_test_algo (prefs->value)
|
||||
? num
|
||||
: gcry_cipher_algo_name (prefs->value));
|
||||
if(!problem)
|
||||
check_prefs_warning(pk);
|
||||
log_info(_(" \"%s\": preference for cipher"
|
||||
" algorithm %s\n"),user,algo?algo:num);
|
||||
" algorithm %s\n"), user, algo);
|
||||
problem=1;
|
||||
}
|
||||
}
|
||||
|
@ -615,11 +618,14 @@ check_prefs(KBNODE keyblock)
|
|||
{
|
||||
if(openpgp_md_test_algo(prefs->value))
|
||||
{
|
||||
const char *algo = gcry_md_algo_name (prefs->value);
|
||||
const char *algo =
|
||||
(gcry_md_test_algo (prefs->value)
|
||||
? num
|
||||
: gcry_md_algo_name (prefs->value));
|
||||
if(!problem)
|
||||
check_prefs_warning(pk);
|
||||
log_info(_(" \"%s\": preference for digest"
|
||||
" algorithm %s\n"),user,algo?algo:num);
|
||||
" algorithm %s\n"), user, algo);
|
||||
problem=1;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue