RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/lib/ rpmns.c tpgp.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Sun 30 Dec 2007 - 23:44:19 CET
Message-Id: <20071230224419.046C634845C@rpm5.org>
  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:   30-Dec-2007 23:44:18
  Branch: HEAD                             Handle: 2007123022441800

  Modified files:
    rpm/lib                 rpmns.c tpgp.c

  Log:
    - tweak the clearsign'd digest code a bit. tested aginst rse's failure
    case.

  Summary:
    Revision    Changes     Path
    1.13        +3  -3      rpm/lib/rpmns.c
    2.16        +1  -0      rpm/lib/tpgp.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmns.c
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 rpmns.c
  --- rpm/lib/rpmns.c	30 Dec 2007 22:33:07 -0000	1.12
  +++ rpm/lib/rpmns.c	30 Dec 2007 22:44:18 -0000	1.13
  @@ -431,10 +431,10 @@
   	    while (t < be) {
   		const char * teol;
   		const char * te;
  -		if ((teol = strchr(t, '\n')) == NULL)
  +		if ((teol = te = strchr(t, '\n')) == NULL)
   		    break;
  -		for (te = teol; te > t && strchr(" \t\r\n", te[-1]); te--)
  -		    ;
  +		while (te > t && strchr(" \t\r\n", te[-1]))
  +		    te--;
   		xx = rpmDigestUpdate(ctx, t, (te - t));
    		if (!strncmp((t = teol + 1), sigtxt, strlen(sigtxt)))
   		    break;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/tpgp.c
  ============================================================================
  $ cvs diff -u -r2.15 -r2.16 tpgp.c
  --- rpm/lib/tpgp.c	30 Dec 2007 16:47:41 -0000	2.15
  +++ rpm/lib/tpgp.c	30 Dec 2007 22:44:18 -0000	2.16
  @@ -81,6 +81,7 @@
       rpmts ts = NULL;
       int rc;
   
  +_rpmns_debug = 1;
   _pgp_debug = 1;
   _pgp_print = 1;
   
  @@ .
Received on Sun Dec 30 23:44:19 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.