diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/mainproc.c | 36 |
2 files changed, 33 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e0e8e90fe..b04586171 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -5,6 +5,11 @@ * sign.c (sign_file, clearsign_file, sign_symencrypt_file): Remove unused code. +2003-04-01 Werner Koch <[email protected]> + + * mainproc.c (check_sig_and_print): Add primary key fpr to VALIDSIG + status. + 2003-03-24 David Shaw <[email protected]> * keydb.h: Err on the side of making an unknown signature a SIG diff --git a/g10/mainproc.c b/g10/mainproc.c index 3edf310ac..31ada1c0b 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1,5 +1,5 @@ /* mainproc.c - handle packets - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -1442,17 +1442,37 @@ check_sig_and_print( CTX c, KBNODE node ) if( !get_pubkey( pk, sig->keyid ) ) { byte array[MAX_FINGERPRINT_LEN], *p; - char buf[MAX_FINGERPRINT_LEN*2+72]; + char buf[MAX_FINGERPRINT_LEN*4+73], *bufp; size_t i, n; + bufp = buf; fingerprint_from_pk( pk, array, &n ); p = array; - for(i=0; i < n ; i++, p++ ) - sprintf(buf+2*i, "%02X", *p ); - sprintf(buf+strlen(buf), " %s %lu %lu", - strtimestamp( sig->timestamp ), - (ulong)sig->timestamp, - (ulong)sig->expiredate ); + for(i=0; i < n ; i++, p++, bufp += 2) + sprintf(bufp, "%02X", *p ); + sprintf(bufp, " %s %lu %lu ", + strtimestamp( sig->timestamp ), + (ulong)sig->timestamp, + (ulong)sig->expiredate ); + bufp = bufp + strlen (bufp); + if (!pk->is_primary) { + u32 akid[2]; + + akid[0] = pk->main_keyid[0]; + akid[1] = pk->main_keyid[1]; + free_public_key (pk); + pk = m_alloc_clear( sizeof *pk ); + if (get_pubkey (pk, akid)) { + /* impossible error, we simply return a zeroed out fpr */ + n = MAX_FINGERPRINT_LEN < 20? MAX_FINGERPRINT_LEN : 20; + memset (array, 0, n); + } + else + fingerprint_from_pk( pk, array, &n ); + } + p = array; + for(i=0; i < n ; i++, p++, bufp += 2) + sprintf(bufp, "%02X", *p ); write_status_text( STATUS_VALIDSIG, buf ); } free_public_key( pk ); |