RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   29-Dec-2007 17:00:08
  Branch: HEAD                             Handle: 2007122916000701

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               rpmpgp.c

  Log:
    - pgpReadPkts: truncate binary encoded pgp pktlen to actual length.

  Summary:
    Revision    Changes     Path
    1.2036      +1  -0      rpm/CHANGES
    2.85        +5  -0      rpm/rpmio/rpmpgp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2035 -r1.2036 CHANGES
  --- rpm/CHANGES	29 Dec 2007 15:41:31 -0000	1.2035
  +++ rpm/CHANGES	29 Dec 2007 16:00:07 -0000	1.2036
  @@ -1,4 +1,5 @@
   5.0b3 -> 5.0b4:
  +    - jbj: pgpReadPkts: truncate binary encoded pgp pktlen to actual length.
       - jbj: pgpReadPkts: identify binary encoded pgp pkts correctly.
       - jbj: fix: remove unused assertion.
       - jbj: fix: undo deliberate damage from rpm's RHL8 security audit. ptooey!
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  ============================================================================
  $ cvs diff -u -r2.84 -r2.85 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c	29 Dec 2007 15:41:32 -0000	2.84
  +++ rpm/rpmio/rpmpgp.c	29 Dec 2007 16:00:08 -0000	2.85
  @@ -1299,6 +1299,11 @@
   	case PGPTAG_FOO:	ec = PGPARMOR_PRIVKEY;	break;
   #endif
   	}
  +	/* Truncate blen to actual no. of octets in packet. */
  +	if (ec != PGPARMOR_NONE) {
  +	    pgpPkt pp = alloca(sizeof(*pp));
  +	    blen = pgpPktLen(b, blen, pp);
  +	}
   	goto exit;
       }
   
  @@ .