[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpgp.c

2016-04-19 Thread Jeff Johnson 
  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:   19-Apr-2016 15:03:10
  Branch: rpm-5_4  Handle: 2016041913031000

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   rpmpgp.c

  Log:
- remove compiler warning.

  Summary:
RevisionChanges Path
2.127.2.19  +1  -1  rpm/rpmio/rpmpgp.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.127.2.18 -r2.127.2.19 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c15 Apr 2016 18:09:19 -  2.127.2.18
  +++ rpm/rpmio/rpmpgp.c19 Apr 2016 13:03:10 -  2.127.2.19
  @@ -312,7 +312,7 @@
   int pgpPrtSubType(const rpmuint8_t * h, size_t hlen, pgpSigType sigtype)
   {
   const rpmuint8_t * p = h;
  -unsigned plen;
  +unsigned plen = 0;
   unsigned i;
   
   while (hlen > 0) {
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpgp.c

2016-04-03 Thread Jeff Johnson 
  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:   03-Apr-2016 22:39:32
  Branch: rpm-5_4  Handle: 2016040320393200

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   rpmpgp.c

  Log:
- pgpPktLen: check return code.

  Summary:
RevisionChanges Path
2.127.2.17  +4  -2  rpm/rpmio/rpmpgp.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.127.2.16 -r2.127.2.17 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c24 Feb 2015 20:24:09 -  2.127.2.16
  +++ rpm/rpmio/rpmpgp.c3 Apr 2016 20:39:32 -   2.127.2.17
  @@ -453,6 +453,7 @@
   int xx;
   int i;
   
  +assert(p);
   for (i = 0; p < pend; i++, p += pgpMpiLen(p)) {
if (pubkey_algo == PGPPUBKEYALGO_RSA) {
if (i >= 1) break;
  @@ -515,7 +516,8 @@
if (_pgp_print)
fprintf(stderr, "%7d", i);
}
  - pgpPrtStr("", pgpMpiStr(p));
  + if (p)
  + pgpPrtStr("", pgpMpiStr(p));
pgpPrtNL();
   }
   
  @@ -1031,7 +1033,7 @@
   pgpPkt pp = (pgpPkt) alloca(sizeof(*pp));
   int rc = pgpPktLen(pkt, pktlen, pp);
   
  -if (!(pp->tag == PGPTAG_PUBLIC_KEY || pp->tag == PGPTAG_PUBLIC_SUBKEY))
  +if (rc < 0 || !(pp->tag == PGPTAG_PUBLIC_KEY || pp->tag == 
PGPTAG_PUBLIC_SUBKEY))
return -1;
   
   /* Choose the correct keyid. */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpgp.c rpmpgp.h

2015-02-24 Thread Jeff Johnson 
  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:   24-Feb-2015 21:24:09
  Branch: rpm-5_4  Handle: 2015022420240900

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   rpmpgp.c rpmpgp.h

  Log:
- gcrypt: sketch in EdDSA support.

  Summary:
RevisionChanges Path
2.127.2.16  +1  -1  rpm/rpmio/rpmpgp.c
2.108.2.16  +1  -1  rpm/rpmio/rpmpgp.h
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.127.2.15 -r2.127.2.16 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c17 Sep 2014 03:36:21 -  2.127.2.15
  +++ rpm/rpmio/rpmpgp.c24 Feb 2015 20:24:09 -  2.127.2.16
  @@ -491,7 +491,7 @@
if (xx) return xx;
}
pgpPrtStr(, pgpSigDSA[i]);
  - } else if (pubkey_algo == PGPPUBKEYALGO_ECDSA) {
  + } else if (pubkey_algo == PGPPUBKEYALGO_ECDSA || pubkey_algo == 
PGPPUBKEYALGO_EDDSA) {
if (i = 2) break;
if (dig 
(dig != _dig || sigtype == PGPSIGTYPE_BINARY || sigtype == 
PGPSIGTYPE_TEXT))
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmpgp.h
  
  $ cvs diff -u -r2.108.2.15 -r2.108.2.16 rpmpgp.h
  --- rpm/rpmio/rpmpgp.h27 Sep 2014 15:51:24 -  2.108.2.15
  +++ rpm/rpmio/rpmpgp.h24 Feb 2015 20:24:09 -  2.108.2.16
  @@ -269,7 +269,7 @@
   PGPPUBKEYALGO_ECDH   = 18,   /*! ECDH */
   PGPPUBKEYALGO_ECDSA  = 19,   /*! ECDSA */
   PGPPUBKEYALGO_ELGAMAL= 20,   /*! Elgamal */
  -PGPPUBKEYALGO_EDDSA  = 105   /*! EDDSA */
  +PGPPUBKEYALGO_EDDSA  = 22/*! EDDSA */
   } pgpPubkeyAlgo;
   /*@=typeuse@*/
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpgp.c

2014-05-14 Thread Jeff Johnson 
  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:   15-May-2014 00:42:44
  Branch: rpm-5_4  Handle: 2014051422424300

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   rpmpgp.c

  Log:
- coverity #1214094

  Summary:
RevisionChanges Path
2.127.2.12  +6  -4  rpm/rpmio/rpmpgp.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.127.2.11 -r2.127.2.12 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c5 May 2014 19:16:30 -   2.127.2.11
  +++ rpm/rpmio/rpmpgp.c14 May 2014 22:42:43 -  2.127.2.12
  @@ -768,7 +768,7 @@
}
}
if (i == 0) {
  - pgpPrtHex( Curve = [ OID]:, p+1, p[0]);
  + pgpPrtHex(Curve = [ OID]:, p+1, p[0]);
pgpPrtNL();
p += p[0] + 1;
pgpPrtStr(pgpPublicECDSA[i], pgpMpiStr(p));
  @@ -789,12 +789,12 @@
}
}
if (i == 0) {
  - pgpPrtHex( Curve = [ OID]:, p+1, p[0]);
  + pgpPrtHex(Curve = [ OID]:, p+1, p[0]);
p += p[0] + 1;
pgpPrtNL();
pgpPrtStr(pgpPublicECDH[i], pgpMpiStr(p));
p += pgpMpiLen(p);
  - pgpPrtHex( KDF params:, p+1, p[0]);
  + pgpPrtHex(KDF params:, p+1, p[0]);
p += p[0] + 1;
pgpPrtNL();
break;  /* XXX FIXME: early exit */
  @@ -1213,8 +1213,10 @@
   int rc = 0;
   
   t = rpmExpand(%{?_build_sign}, NULL);
  -if (!(t  *t))
  +if (!(t  *t)) {
  + t = _free(t);   /* coverity #1214094 */
t = xstrdup(DSA);
  +}
   dig-build_sign = t;
   
   if ((te = strrchr(t, '/')) != NULL)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpgp.c

2014-04-24 Thread Jeff Johnson 
  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:   25-Apr-2014 04:39:01
  Branch: rpm-5_4  Handle: 201404250239

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   rpmpgp.c

  Log:
- sanity.

  Summary:
RevisionChanges Path
2.127.2.7   +2  -2  rpm/rpmio/rpmpgp.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.127.2.6 -r2.127.2.7 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c23 Apr 2014 22:25:44 -  2.127.2.6
  +++ rpm/rpmio/rpmpgp.c25 Apr 2014 02:39:00 -  2.127.2.7
  @@ -65,12 +65,12 @@
   /* implict selection (order DOES matter) */
   #elif defined(WITH_BEECRYPT)
rpmbcImplVecs;
  +#elif defined(WITH_GCRYPT)
  + rpmgcImplVecs;
   #elif defined(WITH_NSS)
rpmnssImplVecs;
   #elif defined(WITH_SSL)
rpmsslImplVecs;
  -#elif defined(WITH_GCRYPT)
  - rpmgcImplVecs;
   #elif defined(WITH_TOMCRYPT)
rpmltcImplVecs;
   #elif defined(WITH_CDSA)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpgp.c

2013-06-26 Thread Jeff Johnson 
  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:   26-Jun-2013 22:44:32
  Branch: rpm-5_4  Handle: 2013062620443200

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio   rpmpgp.c

  Log:
- coverity #1035921

  Summary:
RevisionChanges Path
2.127.2.2   +4  -0  rpm/rpmio/rpmpgp.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.127.2.1 -r2.127.2.2 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c16 Apr 2012 20:53:33 -  2.127.2.1
  +++ rpm/rpmio/rpmpgp.c26 Jun 2013 20:44:32 -  2.127.2.2
  @@ -1538,11 +1538,15 @@
crc = pgpCRC(dec, declen);
if (crcpkt != crc) {
ec = PGPARMOR_ERR_CRC_CHECK;
  + dec = _free(dec);   /* XXX coverity #1035921 */
  + declen = 0;
goto exit;
}
iob-b = _free(iob-b);
iob-b = dec;
iob-blen = declen;
  + dec = NULL;
  + declen = 0;
goto exit;
/*@notreached@*/ /*@switchbreak@*/ break;
}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org