diff options
| author | Werner Koch <[email protected]> | 2007-02-26 20:24:29 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-02-26 20:24:29 +0000 |
| commit | f6243073a87e08d756b2337c63b89cc815824e7d (patch) | |
| tree | ce913fa5eb73b47ae37c637200f2ab1cdf591627 /g10/mainproc.c | |
| parent | Updated (diff) | |
| download | gnupg-f6243073a87e08d756b2337c63b89cc815824e7d.tar.gz gnupg-f6243073a87e08d756b2337c63b89cc815824e7d.zip | |
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.
Diffstat (limited to 'g10/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 2a5db6e97..faefacb10 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -273,7 +273,7 @@ proc_symkey_enc( CTX c, PACKET *pkt ) int algo = enc->cipher_algo; const char *s = gcry_cipher_algo_name (algo); - if(s) + if (!gcry_cipher_test_algo (algo)) { if(!opt.quiet) { @@ -1768,7 +1768,8 @@ check_sig_and_print( CTX c, KBNODE node ) /* If we have a good signature and already printed * the primary user ID, print all the other user IDs */ - if ( count && !rc ) { + if ( count && !rc + && !(opt.verify_options&VERIFY_SHOW_PRIMARY_UID_ONLY)) { char *p; for( un=keyblock; un; un = un->next ) { if( un->pkt->pkttype != PKT_USER_ID ) |