diff --git a/ChangeLog b/ChangeLog index ffac7384c..c89d8f6b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-08 Werner Koch + + * Makefile.am (EXTRA_DIST): Add autogen.sh wrapper which is + useful for some cross-compiling targets. + 2003-04-07 David Shaw * acinclude.m4: Fix URL to faqprog.pl. diff --git a/Makefile.am b/Makefile.am index 2693f583b..e562877b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +# Top Makefile for GnuPG +# Copyright (C) 1998,1999,2000,2001,2003 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -25,7 +26,7 @@ checks = checks endif SUBDIRS = intl zlib util mpi cipher tools g10 keyserver po doc ${checks} -EXTRA_DIST = PROJECTS BUGS config.h.in +EXTRA_DIST = PROJECTS BUGS config.h.in autogen.sh DISTCLEANFILES = g10defs.h # Add all the files listed in "distfiles" files to the distribution, diff --git a/NEWS b/NEWS index b77310e16..b5fbd9615 100644 --- a/NEWS +++ b/NEWS @@ -36,6 +36,8 @@ Noteworthy changes in version 1.2.2 (unreleased) * Fixed a compatibility problem with CryptoEx by increasing the window size of the uncompressor. + * Status VALIDSIG does now also print the primary key's fingerprint. + * Add read-only support for the SHA-256 hash, and optional read-only support for the SHA-384 and SHA-512 hashes. diff --git a/TODO b/TODO index c8763d8b3..81c8883ae 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,5 @@ + * Reword the message after create-revocation. + * Reword the "Not enough entropy" messages. * Do we need a configure test for putenv? diff --git a/doc/ChangeLog b/doc/ChangeLog index 733d150dd..c8b3192b5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -6,6 +6,20 @@ SGML tags are closed, clarify --pgp8 allows SHA-256, and document --no-emit-version. +2003-04-01 Werner Koch + + * DETAILS (VALIDSIG): Add primary keys fingerprint. + +2003-04-01 David D. Scribner + + * faq.raw (Question 4.15): Fixed URL + , corrected to be + (had two "httpd://") + (Question 5.9): Appended
tag to end of first line in command + example for proper cr/lf treatment within a tag. + (Footer): Extended copyright to 2003. + Applied by Werner Koch. + 2003-02-24 David Shaw * gpg.sgml: Document "revuid". Clarify that --openpgp resets diff --git a/doc/DETAILS b/doc/DETAILS index a6ba06c5e..a9d76a165 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -157,7 +157,7 @@ more arguments in future versions. this signature. sig_class is a 2 byte hex-value. VALIDSIG - + The signature with the keyid is good. This is the same as GOODSIG but has the fingerprint as the argument. Both @@ -165,6 +165,9 @@ more arguments in future versions. sig-timestamp is the signature creation time in seconds after the epoch. expire-timestamp is the signature expiration time in seconds after the epoch (zero means "does not expire"). + PRIMARY-KEY-FPR is the fingerprint of the primary key or + identical to the first argument. This is useful to get back + to the primary key without running gpg again for this purpose. SIG_ID This is emitted only for signatures of class 0 or 1 which diff --git a/doc/faq.raw b/doc/faq.raw index d1a11e663..b5a805c5b 100644 --- a/doc/faq.raw +++ b/doc/faq.raw @@ -16,8 +16,8 @@ The most recent version of the FAQ is available from [H p] -Version: 1.6.1[H br] -Last-Modified: Dec 28, 2002[H br] +Version: 1.6.2[H br] +Last-Modified: Feb 25, 2003[H br] Maintained-by: [$maintainer] [H /p] @@ -545,7 +545,7 @@ you could search in the mailing list archive. [H a href=http://www.bretschneidernet.de/tips/secmua.html][H /a]. Users of Win32 MUAs that lack OpenPGP support may look into - using GPGrelay [H a href=http://http://gpgrelay.sourceforge.net][H /a], a small + using GPGrelay [H a href=http://gpgrelay.sourceforge.net][H /a], a small email-relaying server that uses GnuPG to enable many email clients to send and receive emails that conform to PGP-MIME (RFC 2015). @@ -853,7 +853,7 @@ you could search in the mailing list archive. Now we can do the usual export: [H samp] - $ gpg --export KeyID > mypublickey.pgp + $ gpg --export KeyID > mypublickey.pgp[H br] $ gpg --export-secret-key KeyID > mysecretkey.pgp [H /samp] @@ -1295,7 +1295,7 @@ you could search in the mailing list archive. [H hr] -Copyright (C) 2000-2002 Free Software Foundation, Inc., +Copyright (C) 2000-2003 Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA Verbatim copying and distribution of this entire article is permitted in 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 + + * mainproc.c (check_sig_and_print): Add primary key fpr to VALIDSIG + status. + 2003-03-24 David Shaw * 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 );