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
|
@ -2319,14 +2319,13 @@ show_prefs (PKT_user_id *uid, PKT_signature *selfsig, int verbose)
|
|||
tty_printf (_("Cipher: "));
|
||||
for(i=any=0; prefs[i].type; i++ ) {
|
||||
if( prefs[i].type == PREFTYPE_SYM ) {
|
||||
const char *s = gcry_cipher_algo_name (prefs[i].value);
|
||||
|
||||
if (any)
|
||||
tty_printf (", ");
|
||||
any = 1;
|
||||
/* We don't want to display strings for experimental algos */
|
||||
if (s && prefs[i].value < 100 )
|
||||
tty_printf ("%s", s );
|
||||
if (!gcry_cipher_test_algo (prefs[i].value)
|
||||
&& prefs[i].value < 100 )
|
||||
tty_printf ("%s", gcry_cipher_algo_name (prefs[i].value));
|
||||
else
|
||||
tty_printf ("[%d]", prefs[i].value);
|
||||
if (prefs[i].value == CIPHER_ALGO_3DES )
|
||||
|
@ -2342,14 +2341,13 @@ show_prefs (PKT_user_id *uid, PKT_signature *selfsig, int verbose)
|
|||
tty_printf (_("Digest: "));
|
||||
for(i=any=0; prefs[i].type; i++ ) {
|
||||
if( prefs[i].type == PREFTYPE_HASH ) {
|
||||
const char *s = gcry_md_algo_name (prefs[i].value);
|
||||
|
||||
if (any)
|
||||
tty_printf (", ");
|
||||
any = 1;
|
||||
/* We don't want to display strings for experimental algos */
|
||||
if (s && prefs[i].value < 100 )
|
||||
tty_printf ("%s", s );
|
||||
if (!gcry_md_test_algo (prefs[i].value)
|
||||
&& prefs[i].value < 100 )
|
||||
tty_printf ("%s", gcry_md_algo_name (prefs[i].value) );
|
||||
else
|
||||
tty_printf ("[%d]", prefs[i].value);
|
||||
if (prefs[i].value == DIGEST_ALGO_SHA1 )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue