security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* verify.c (verify_signatures): Verify multiple files in the same order in

Browse Source 
which we hashed them when issuing the signature.  Noted by Nicholas Cole.

* pkclist.c (do_edit_ownertrust): Fix a kbnode leak and do another
keyid-format conversion.
This commit is contained in:
David Shaw 2004-05-23 16:24:15 +00:00
parent 3624da002f
commit 79bb56aa56
3 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2004-05-23 David Shaw <dshaw@jabberwocky.com>
* verify.c (verify_signatures): Verify multiple files in the same
order in which we hashed them when issuing the signature. Noted
by Nicholas Cole.
* pkclist.c (do_edit_ownertrust): Fix a kbnode leak and do another
keyid-format conversion.
2004-05-22 Werner Koch <wk@gnupg.org> 2004-05-22 Werner Koch <wk@gnupg.org>
* trustdb.c (check_regexp): s/EXP/EXPR/. * trustdb.c (check_regexp): s/EXP/EXPR/.

23
g10/pkclist.c
View File

@ -39,10 +39,8 @@
#include "photoid.h" #include "photoid.h"
#include "i18n.h" #include "i18n.h"
#define CONTROL_D ('D' - 'A' + 1) #define CONTROL_D ('D' - 'A' + 1)
/**************** /****************
* Show the revocation reason as it is stored with the given signature * Show the revocation reason as it is stored with the given signature
*/ */
@ -202,19 +200,21 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
{ {
KBNODE keyblock, un; KBNODE keyblock, un;
tty_printf(_("No trust value assigned to:\n" tty_printf(_("No trust value assigned to:\n"));
"%4u%c/%08lX %s \""), tty_printf("%4u%c/%s %s\n",nbits_from_pk( pk ),
nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ), pubkey_letter( pk->pubkey_algo ),
(ulong)keyid[1], datestr_from_pk( pk ) ); keystr(keyid), datestr_from_pk( pk ) );
tty_printf(_(" \""));
p = get_user_id( keyid, &n ); p = get_user_id( keyid, &n );
tty_print_utf8_string( p, n ), tty_print_utf8_string( p, n );
m_free(p); m_free(p);
tty_printf("\"\n"); tty_printf("\"\n");
keyblock = get_pubkeyblock (keyid); keyblock = get_pubkeyblock (keyid);
if (!keyblock) if (!keyblock)
BUG (); BUG ();
for (un=keyblock; un; un = un->next) { for (un=keyblock; un; un = un->next)
{
if (un->pkt->pkttype != PKT_USER_ID ) if (un->pkt->pkttype != PKT_USER_ID )
continue; continue;
if (un->pkt->pkt.user_id->is_revoked ) if (un->pkt->pkt.user_id->is_revoked )
@ -222,8 +222,8 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
if (un->pkt->pkt.user_id->is_expired ) if (un->pkt->pkt.user_id->is_expired )
continue; continue;
/* Only skip textual primaries */ /* Only skip textual primaries */
if (un->pkt->pkt.user_id->is_primary && if (un->pkt->pkt.user_id->is_primary
!un->pkt->pkt.user_id->attrib_data ) && !un->pkt->pkt.user_id->attrib_data )
continue; continue;
if((opt.verify_options&VERIFY_SHOW_PHOTOS) if((opt.verify_options&VERIFY_SHOW_PHOTOS)
@ -231,7 +231,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
show_photos(un->pkt->pkt.user_id->attribs, show_photos(un->pkt->pkt.user_id->attribs,
un->pkt->pkt.user_id->numattribs,pk,NULL); un->pkt->pkt.user_id->numattribs,pk,NULL);
tty_printf (" %s", _(" aka \"")); tty_printf(_(" aka \""));
tty_print_utf8_string (un->pkt->pkt.user_id->name, tty_print_utf8_string (un->pkt->pkt.user_id->name,
un->pkt->pkt.user_id->len ); un->pkt->pkt.user_id->len );
tty_printf("\"\n"); tty_printf("\"\n");
@ -239,6 +239,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
print_fingerprint (pk, NULL, 2); print_fingerprint (pk, NULL, 2);
tty_printf("\n"); tty_printf("\n");
release_kbnode (keyblock);
} }
/* This string also used in keyedit.c:sign_uids */ /* This string also used in keyedit.c:sign_uids */
tty_printf (_( tty_printf (_(

4
g10/verify.c
View File

@ -1,5 +1,5 @@
/* verify.c - verify signed data /* verify.c - verify signed data
* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. * Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -101,7 +101,7 @@ verify_signatures( int nfiles, char **files )
iobuf_push_filter( fp, armor_filter, &afx ); iobuf_push_filter( fp, armor_filter, &afx );
sl = NULL; sl = NULL;
for(i=1 ; i < nfiles; i++ ) for(i=nfiles-1 ; i > 0 ; i-- )
add_to_strlist( &sl, files[i] ); add_to_strlist( &sl, files[i] );
rc = proc_signature_packets( NULL, fp, sl, sigfile ); rc = proc_signature_packets( NULL, fp, sl, sigfile );
free_strlist(sl); free_strlist(sl);