From f6243073a87e08d756b2337c63b89cc815824e7d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 26 Feb 2007 20:24:29 +0000 Subject: 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. --- g10/encr-data.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'g10/encr-data.c') diff --git a/g10/encr-data.c b/g10/encr-data.c index 696f8af9d..851233cde 100644 --- a/g10/encr-data.c +++ b/g10/encr-data.c @@ -90,11 +90,10 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek ) if ( opt.verbose && !dek->algo_info_printed ) { - const char *s = gcry_cipher_algo_name (dek->algo); - if (s && *s) - log_info(_("%s encrypted data\n"), s ); + if (!gcry_cipher_test_algo (dek->algo)) + log_info (_("%s encrypted data\n"), gcry_cipher_algo_name (dek->algo)); else - log_info(_("encrypted with unknown algorithm %d\n"), dek->algo ); + log_info (_("encrypted with unknown algorithm %d\n"), dek->algo ); dek->algo_info_printed = 1; } rc = openpgp_cipher_test_algo (dek->algo); -- cgit v1.2.3