RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/rpmio/ rpmssl.c

From: Anders F. Björklund <afb@rpm5.org>
Date: Tue 05 Aug 2008 - 15:54:08 CEST
Message-Id: <20080805135408.4914B5ED8B@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   05-Aug-2008 15:54:08
  Branch: HEAD                             Handle: 2008080513540800

  Modified files:
    rpm/rpmio               rpmssl.c

  Log:
    limp along without ssl

  Summary:
    Revision    Changes     Path
    2.14        +7  -0      rpm/rpmio/rpmssl.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmssl.c
  ============================================================================
  $ cvs diff -u -r2.13 -r2.14 rpmssl.c
  --- rpm/rpmio/rpmssl.c	2 Aug 2008 22:37:39 -0000	2.13
  +++ rpm/rpmio/rpmssl.c	5 Aug 2008 13:54:08 -0000	2.14
  @@ -5,6 +5,7 @@
   #include "system.h"
   #include <rpmlog.h>
   
  +#include <rpmiotypes.h>
   #define	_RPMPGP_INTERNAL
   #if defined(WITH_SSL)
   
  @@ -199,6 +200,7 @@
   int rpmsslSetDSA(/*@only@*/ DIGEST_CTX ctx, pgpDig dig, pgpDigParams sigp)
   	/*@modifies dig @*/
   {
  +#if defined(WITH_SSL)
       int xx;
   
       /* Set DSA hash. */
  @@ -206,6 +208,9 @@
   
       /* Compare leading 16 bits of digest for quick check. */
       return memcmp(dig->sha1, sigp->signhash16, sizeof(sigp->signhash16));
  +#else
  +    return 1;
  +#endif	/* WITH_SSL */
   }
   
   static
  @@ -344,9 +349,11 @@
   #endif	/* WITH_SSL */
   }
   
  +#if defined(WITH_SSL)
   struct pgpImplVecs_s rpmsslImplVecs = {
   	rpmsslSetRSA, rpmsslVerifyRSA,
   	rpmsslSetDSA, rpmsslVerifyDSA,
   	rpmsslMpiItem, rpmsslClean,
   	rpmsslFree, rpmsslInit
   };
  +#endif
  @@ .
Received on Tue Aug 5 15:54:08 2008
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.