security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

Re-indent code and use test macros for betetr readability

Browse Source
This commit is contained in:
Werner Koch 2010-05-07 10:36:24 +00:00
parent 7d0aa53f7f
commit d766978c0e
2 changed files with 171 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2010-05-07 Werner Koch <wk@g10code.com>
* import.c (chk_self_sigs): Re-indent and slighly re-arrange code.
Use test macros for the sig class.
2010-03-12 Werner Koch <wk@g10code.com> 2010-03-12 Werner Koch <wk@g10code.com>
* plaintext.c (setup_plaintext_name): Do not encode pipe like * plaintext.c (setup_plaintext_name): Do not encode pipe like

78
g10/import.c
View File

@ -1348,8 +1348,8 @@ import_revoke_cert( const char *fname, KBNODE node, struct stats_s *stats )
} }
/**************** /*
* loop over the keyblock and check all self signatures. * Loop over the keyblock and check all self signatures.
* Mark all user-ids with a self-signature by setting flag bit 0. * Mark all user-ids with a self-signature by setting flag bit 0.
* Mark all user-ids with an invalid self-signature by setting bit 1. * Mark all user-ids with an invalid self-signature by setting bit 1.
* This works also for subkeys, here the subkey is marked. Invalid or * This works also for subkeys, here the subkey is marked. Invalid or
@ -1370,7 +1370,8 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
(void)fname; (void)fname;
(void)pk; (void)pk;
for( n=keyblock; (n = find_next_kbnode(n, 0)); ) { for (n=keyblock; (n = find_next_kbnode (n, 0)); )
{
if (n->pkt->pkttype == PKT_PUBLIC_SUBKEY) if (n->pkt->pkttype == PKT_PUBLIC_SUBKEY)
{ {
knode = n; knode = n;
@ -1380,10 +1381,16 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
rsnode = NULL; rsnode = NULL;
continue; continue;
} }
else if( n->pkt->pkttype != PKT_SIGNATURE )
if ( n->pkt->pkttype != PKT_SIGNATURE )
continue; continue;
sig = n->pkt->pkt.signature; sig = n->pkt->pkt.signature;
if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] ) { if ( keyid[0] != sig->keyid[0] || keyid[1] != sig->keyid[1] )
{
*non_self = 1;
continue;
}
/* This just caches the sigs for later use. That way we /* This just caches the sigs for later use. That way we
import a fully-cached key which speeds things up. */ import a fully-cached key which speeds things up. */
@ -1397,19 +1404,21 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
{ {
log_error( _("key %s: no user ID for signature\n"), log_error( _("key %s: no user ID for signature\n"),
keystr(keyid)); keystr(keyid));
return -1; /* the complete keyblock is invalid */ return -1; /* The complete keyblock is invalid. */
} }
/* If it hasn't been marked valid yet, keep trying */ /* If it hasn't been marked valid yet, keep trying. */
if(!(unode->flag&1)) { if (!(unode->flag&1))
{
rc = check_key_signature (keyblock, n, NULL); rc = check_key_signature (keyblock, n, NULL);
if ( rc ) if ( rc )
{ {
if ( opt.verbose ) if ( opt.verbose )
{ {
char *p=utf8_to_native(unode->pkt->pkt.user_id->name, char *p = utf8_to_native
(unode->pkt->pkt.user_id->name,
strlen (unode->pkt->pkt.user_id->name),0); strlen (unode->pkt->pkt.user_id->name),0);
log_info( rc == G10ERR_PUBKEY_ALGO ? log_info (gpg_err_code(rc) == G10ERR_PUBKEY_ALGO ?
_("key %s: unsupported public key " _("key %s: unsupported public key "
"algorithm on user ID \"%s\"\n"): "algorithm on user ID \"%s\"\n"):
_("key %s: invalid self-signature " _("key %s: invalid self-signature "
@ -1419,13 +1428,14 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
} }
} }
else else
unode->flag |= 1; /* mark that signature checked */ unode->flag |= 1; /* Mark that signature checked. */
} }
} }
else if( sig->sig_class == 0x18 ) { else if ( IS_SUBKEY_SIG (sig) )
/* Note that this works based solely on the timestamps {
like the rest of gpg. If the standard gets /* Note that this works based solely on the timestamps like
revocation targets, this may need to be revised. */ the rest of gpg. If the standard gets revocation
targets, this may need to be revised. */
if ( !knode ) if ( !knode )
{ {
@ -1440,7 +1450,7 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
if ( rc ) if ( rc )
{ {
if (opt.verbose) if (opt.verbose)
log_info(rc == G10ERR_PUBKEY_ALGO ? log_info (gpg_err_code (rc) == G10ERR_PUBKEY_ALGO ?
_("key %s: unsupported public key" _("key %s: unsupported public key"
" algorithm\n"): " algorithm\n"):
_("key %s: invalid subkey binding\n"), _("key %s: invalid subkey binding\n"),
@ -1450,13 +1460,14 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
else else
{ {
/* It's valid, so is it newer? */ /* It's valid, so is it newer? */
if(sig->timestamp>=bsdate) { if (sig->timestamp >= bsdate)
knode->flag |= 1; /* the subkey is valid */ {
knode->flag |= 1; /* The subkey is valid. */
if (bsnode) if (bsnode)
{ {
bsnode->flag|=4; /* Delete the last binding /* Delete the last binding sig since this
sig since this one is one is newer */
newer */ bsnode->flag |= 4;
if (opt.verbose) if (opt.verbose)
log_info (_("key %s: removed multiple subkey" log_info (_("key %s: removed multiple subkey"
" binding\n"),keystr(keyid)); " binding\n"),keystr(keyid));
@ -1470,13 +1481,13 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
} }
} }
} }
else if( sig->sig_class == 0x28 ) { else if ( IS_SUBKEY_REV (sig) )
/* We don't actually mark the subkey as revoked right {
now, so just check that the revocation sig is the /* We don't actually mark the subkey as revoked right now,
most recent valid one. Note that we don't care if so just check that the revocation sig is the most recent
the binding sig is newer than the revocation sig. valid one. Note that we don't care if the binding sig is
See the comment in getkey.c:merge_selfsigs_subkey for newer than the revocation sig. See the comment in
more */ getkey.c:merge_selfsigs_subkey for more. */
if ( !knode ) if ( !knode )
{ {
if (opt.verbose) if (opt.verbose)
@ -1490,7 +1501,7 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
if ( rc ) if ( rc )
{ {
if(opt.verbose) if(opt.verbose)
log_info(rc == G10ERR_PUBKEY_ALGO ? log_info (gpg_err_code (rc) == G10ERR_PUBKEY_ALGO ?
_("key %s: unsupported public" _("key %s: unsupported public"
" key algorithm\n"): " key algorithm\n"):
_("key %s: invalid subkey revocation\n"), _("key %s: invalid subkey revocation\n"),
@ -1504,9 +1515,9 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
{ {
if (rsnode) if (rsnode)
{ {
rsnode->flag|=4; /* Delete the last revocation /* Delete the last revocation sig since
sig since this one is this one is newer. */
newer */ rsnode->flag |= 4;
if (opt.verbose) if (opt.verbose)
log_info (_("key %s: removed multiple subkey" log_info (_("key %s: removed multiple subkey"
" revocation\n"),keystr(keyid)); " revocation\n"),keystr(keyid));
@ -1521,9 +1532,6 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
} }
} }
} }
else
*non_self=1;
}
return 0; return 0;
} }