RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 04-Apr-2016 06:23:22
Branch: rpm-5_4 Handle: 2016040404232200
Modified files: (Branch: rpm-5_4)
rpm/rpmdb rpmns.c
Log:
- rpmns: check pgpPktLen() validity.
Summary:
Revision Changes Path
1.15.2.8 +1 -3 rpm/rpmdb/rpmns.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmns.c
============================================================================
$ cvs diff -u -r1.15.2.7 -r1.15.2.8 rpmns.c
--- rpm/rpmdb/rpmns.c 19 Jul 2014 23:33:24 -0000 1.15.2.7
+++ rpm/rpmdb/rpmns.c 4 Apr 2016 04:23:22 -0000 1.15.2.8
@@ -367,6 +367,7 @@
pleft = sigpktlen;
xx = pgpPktLen(sigpkt, pleft, pp);
+ if (xx < 0) goto exit;
xx = rpmhkpLoadSignature(NULL, dig, pp);
if (xx) goto exit;
@@ -412,9 +413,6 @@
/* XXX TODO: only validate once, then cache using rpmku */
/* XXX need at least 3 packets to validate a pubkey */
if (validate && hkp->npkts >= 3) {
-#ifdef DYING
-pgpPrtPkts(hkp->pkt, hkp->pktlen, NULL, 1);
-#endif
xx = rpmhkpValidate(hkp, NULL);
switch (xx) {
case RPMRC_OK:
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
