diff options
| author | Werner Koch <wk@gnupg.org> | 2006-04-19 15:24:36 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2006-04-19 15:24:36 +0200 |
| commit | d0907e64f473b743ec7a6888583e19502b804ca2 (patch) | |
| tree | 455edb5bd2b75ce96b967fc398160f3adb989a66 /g10/keylist.c | |
| parent | Merged with gpg 1.4.3 code. (diff) | |
| download | gnupg2-d0907e64f473b743ec7a6888583e19502b804ca2.tar.xz gnupg2-d0907e64f473b743ec7a6888583e19502b804ca2.zip | |
Continued with merging.
Still does not build.
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index 0ff788e18..0b1a51b6d 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -917,7 +917,8 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque ) rc = check_key_signature( keyblock, node, NULL ); switch( gpg_err_code (rc) ) { case 0: sigrc = '!'; break; - case GPG_ERR_BAD_SIGN: stats->inv_sigs++; sigrc = '-'; break; + case GPG_ERR_BAD_SIGNATURE: + stats->inv_sigs++; sigrc = '-'; break; case GPG_ERR_NO_PUBKEY: case GPG_ERR_UNUSABLE_PUBKEY: stats->no_key++; continue; default: stats->oth_err++; sigrc = '%'; break; @@ -1306,11 +1307,11 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr ) rc = check_key_signature2( keyblock, node, NULL, signer_pk, NULL, NULL, NULL ); switch ( gpg_err_code (rc) ) { - case 0: sigrc = '!'; break; - case GPG_ERR_BAD_SIGN: sigrc = '-'; break; + case 0: sigrc = '!'; break; + case GPG_ERR_BAD_SIGNATURE: sigrc = '-'; break; case GPG_ERR_NO_PUBKEY: - case GPG_ERR_UNU_PUBKEY: sigrc = '?'; break; - default: sigrc = '%'; break; + case Gpg_Err_UNUSABLE_PUBKEY: sigrc = '?'; break; + default: sigrc = '%'; break; } if(opt.no_sig_cache) |