security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

* import.c (import_keys_stream): Fix compiler type warning.

Browse Source 
* keyring.c (keyring_rebuild_cache), sig-check.c (check_key_signature2),
import.c (import, chk_self_sigs): Minor language cleanups.
This commit is contained in:
David Shaw 2002-09-24 21:20:48 +00:00
parent c5faf2270a
commit 7ad7f453c0
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2002-09-24 David Shaw <dshaw@jabberwocky.com>
* import.c (import_keys_stream): Fix compiler type warning.
* keyring.c (keyring_rebuild_cache), sig-check.c
(check_key_signature2), import.c (import, chk_self_sigs): Minor
language cleanups.
2002-09-23 Stefan Bellon <sbellon@sbellon.de> 2002-09-23 Stefan Bellon <sbellon@sbellon.de>
* main.h: Introduced fast-import as import option. Removed * main.h: Introduced fast-import as import option. Removed

14
g10/import.c
View File

@ -238,7 +238,7 @@ import_keys( char **fnames, int nnames,
int int
import_keys_stream( IOBUF inp, void *stats_handle, unsigned int options ) import_keys_stream( IOBUF inp, void *stats_handle, unsigned int options )
{ {
return import_keys_internal( inp, NULL, NULL, stats_handle, options); return import_keys_internal( inp, NULL, 0, stats_handle, options);
} }
static int static int
@ -276,7 +276,7 @@ import( IOBUF inp, const char* fname,
if( rc ) if( rc )
break; break;
if( !(++stats->count % 100) && !opt.quiet ) if( !(++stats->count % 100) && !opt.quiet )
log_info(_("%lu keys so far processed\n"), stats->count ); log_info(_("%lu keys processed so far\n"), stats->count );
} }
if( rc == -1 ) if( rc == -1 )
rc = 0; rc = 0;
@ -1055,8 +1055,8 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
revocation targets, this may need to be revised. */ revocation targets, this may need to be revised. */
if( !knode ) { if( !knode ) {
log_info( _("key %08lX: no subkey for key binding\n"), log_info( _("key %08lX: no subkey for subkey "
(ulong)keyid[1]); "binding signature\n"),(ulong)keyid[1]);
n->flag |= 4; /* delete this */ n->flag |= 4; /* delete this */
} }
else { else {
@ -1096,8 +1096,8 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
See the comment in getkey.c:merge_selfsigs_subkey for See the comment in getkey.c:merge_selfsigs_subkey for
more */ more */
if( !knode ) { if( !knode ) {
log_info( _("key %08lX: no subkey for key revocation\n"), log_info( _("key %08lX: no subkey for subkey "
(ulong)keyid[1]); "revocation signature\n"),(ulong)keyid[1]);
n->flag |= 4; /* delete this */ n->flag |= 4; /* delete this */
} }
else { else {
@ -1117,7 +1117,7 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
sig since this one is sig since this one is
newer */ newer */
log_info(_("key %08lX: removed multiple subkey " log_info(_("key %08lX: removed multiple subkey "
"revocation\n"),(ulong)keyid[1]); "revocation signatures\n"),(ulong)keyid[1]);
} }
rsnode=n; rsnode=n;

2
g10/keyring.c
View File

@ -1374,7 +1374,7 @@ keyring_rebuild_cache (void *token)
goto leave; goto leave;
if ( !(++count % 50) && !opt.quiet) if ( !(++count % 50) && !opt.quiet)
log_info(_("%lu keys so far checked (%lu signatures)\n"), log_info(_("%lu keys checked so far (%lu signatures)\n"),
count, sigcount ); count, sigcount );
} /* end main loop */ } /* end main loop */

6
g10/sig-check.c
View File

@ -547,7 +547,7 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig,
else { else {
if (!opt.quiet) if (!opt.quiet)
log_info (_("key %08lX: no subkey for subkey " log_info (_("key %08lX: no subkey for subkey "
"revocation packet\n"), "revocation signature\n"),
(ulong)keyid_from_pk (pk, NULL)); (ulong)keyid_from_pk (pk, NULL));
rc = G10ERR_SIG_CLASS; rc = G10ERR_SIG_CLASS;
} }
@ -572,8 +572,8 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig,
} }
else { else {
if (!opt.quiet) if (!opt.quiet)
log_info ("key %08lX: no subkey for subkey binding packet\n", log_info ("key %08lX: no subkey for subkey "
(ulong)keyid_from_pk (pk, NULL)); "binding signature\n",(ulong)keyid_from_pk(pk,NULL));
rc = G10ERR_SIG_CLASS; rc = G10ERR_SIG_CLASS;
} }
} }