security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-24 10:39:57 +01:00
Code Activity

See ChangeLog: Thu Feb 10 11:39:41 CET 2000 Werner Koch

Browse Source
This commit is contained in:
Werner Koch 2000-02-10 10:41:03 +00:00
parent 673a50de0f
commit 24421d0501
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
Thu Feb 10 11:39:41 CET 2000 Werner Koch <wk@gnupg.de>
* keylist.c (list_keyblock): Don't print warnings in the middle of
regulat output lines. By Rémi.
* sig-check.c: Include options.h
Wed Feb 9 15:33:44 CET 2000 Werner Koch <wk@gnupg.de> Wed Feb 9 15:33:44 CET 2000 Werner Koch <wk@gnupg.de>
* gpg.c: New option --ignore-time-conflict * gpg.c: New option --ignore-time-conflict

8
g10/keylist.c
View File

@ -351,6 +351,7 @@ list_keyblock( KBNODE keyblock, int secret )
else if( opt.list_sigs && node->pkt->pkttype == PKT_SIGNATURE ) { else if( opt.list_sigs && node->pkt->pkttype == PKT_SIGNATURE ) {
PKT_signature *sig = node->pkt->pkt.signature; PKT_signature *sig = node->pkt->pkt.signature;
int sigrc; int sigrc;
char *sigstr;
if( !any ) { /* no user id, (maybe a revocation follows)*/ if( !any ) { /* no user id, (maybe a revocation follows)*/
if( sig->sig_class == 0x20 ) if( sig->sig_class == 0x20 )
@ -368,11 +369,11 @@ list_keyblock( KBNODE keyblock, int secret )
if( sig->sig_class == 0x20 || sig->sig_class == 0x28 if( sig->sig_class == 0x20 || sig->sig_class == 0x28
|| sig->sig_class == 0x30 ) || sig->sig_class == 0x30 )
fputs("rev", stdout); sigstr = "rev";
else if( (sig->sig_class&~3) == 0x10 ) else if( (sig->sig_class&~3) == 0x10 )
fputs("sig", stdout); sigstr = "sig";
else if( sig->sig_class == 0x18 ) else if( sig->sig_class == 0x18 )
fputs("sig", stdout); sigstr = "sig";
else { else {
if( opt.with_colons ) if( opt.with_colons )
printf("sig::::::::::%02x:\n",sig->sig_class ); printf("sig::::::::::%02x:\n",sig->sig_class );
@ -395,6 +396,7 @@ list_keyblock( KBNODE keyblock, int secret )
rc = 0; rc = 0;
sigrc = ' '; sigrc = ' ';
} }
fputs( sigstr, stdout );
if( opt.with_colons ) { if( opt.with_colons ) {
putchar(':'); putchar(':');
if( sigrc != ' ' ) if( sigrc != ' ' )

1
g10/sig-check.c
View File

@ -32,6 +32,7 @@
#include "main.h" #include "main.h"
#include "status.h" #include "status.h"
#include "i18n.h" #include "i18n.h"
#include "options.h"
struct cmp_help_context_s { struct cmp_help_context_s {
PKT_signature *sig; PKT_signature *sig;