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: 18-Jul-2014 21:48:06
Branch: rpm-5_4 Handle: 2014071819480104
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio rpmpgp.c
Log:
- pgp: add #ifdef's for optional crypto libs (Mark Hatle).
Summary:
Revision Changes Path
1.3501.2.400+1 -0 rpm/CHANGES
2.127.2.13 +20 -0 rpm/rpmio/rpmpgp.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.399 -r1.3501.2.400 CHANGES
--- rpm/CHANGES 15 Jun 2014 17:15:43 -0000 1.3501.2.399
+++ rpm/CHANGES 18 Jul 2014 19:48:01 -0000 1.3501.2.400
@@ -1,4 +1,5 @@
5.4.14 -> 5.4.15:
+ - jbj: pgp: add #ifdef's for optional crypto libs (Mark Hatle).
- jbj: rpmlog: export rpmlogRecPriority and rpmlogRecMessage (Jacob
Bogusz).
- jbj: fix: make sure the rpmgi ref is released on gpg invocation errors.
- jbj: git: keep up with latest tip.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.c
============================================================================
$ cvs diff -u -r2.127.2.12 -r2.127.2.13 rpmpgp.c
--- rpm/rpmio/rpmpgp.c 14 May 2014 22:42:43 -0000 2.127.2.12
+++ rpm/rpmio/rpmpgp.c 18 Jul 2014 19:48:05 -0000 2.127.2.13
@@ -1339,16 +1339,26 @@
{
int rc = 0; /* assume failure */
+#if defined(WITH_BEECRYPT)
if (pgpImplVecs == &rpmbcImplVecs)
rc = rpmbcExportPubkey(dig);
+#endif
+#if defined(WITH_SSL)
if (pgpImplVecs == &rpmsslImplVecs)
rc = rpmsslExportPubkey(dig);
+#endif
+#if defined(WITH_NSS)
if (pgpImplVecs == &rpmnssImplVecs)
rc = rpmnssExportPubkey(dig);
+#endif
+#if defined(WITH_GCRYPT)
if (pgpImplVecs == &rpmgcImplVecs)
rc = rpmgcExportPubkey(dig);
+#endif
+#if defined(WITH_TOMCRYPT)
if (pgpImplVecs == &rpmltcImplVecs)
rc = rpmltcExportPubkey(dig);
+#endif
return rc;
}
@@ -1356,16 +1366,26 @@
{
int rc = 0; /* assume failure */
+#if defined(WITH_BEECRYPT)
if (pgpImplVecs == &rpmbcImplVecs)
rc = rpmbcExportSignature(dig, ctx);
+#endif
+#if defined(WITH_SSL)
if (pgpImplVecs == &rpmsslImplVecs)
rc = rpmsslExportSignature(dig, ctx);
+#endif
+#if defined(WITH_NSS)
if (pgpImplVecs == &rpmnssImplVecs)
rc = rpmnssExportSignature(dig, ctx);
+#endif
+#if defined(WITH_GCRYPT)
if (pgpImplVecs == &rpmgcImplVecs)
rc = rpmgcExportSignature(dig, ctx);
+#endif
+#if defined(WITH_TOMCRYPT)
if (pgpImplVecs == &rpmltcImplVecs)
rc = rpmltcExportSignature(dig, ctx);
+#endif
return rc;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
