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: 17-Mar-2016 22:44:14
Branch: rpm-5_4 Handle: 2016031721441301
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio rpmltc.c
Log:
- ltc: fix: retrofit a #define for LTC_LTC_PKCS_1_V1_5 enum detection.
Summary:
Revision Changes Path
1.3501.2.474+1 -0 rpm/CHANGES
2.472.2.135 +3 -0 rpm/configure.ac
1.2.4.14 +2 -2 rpm/rpmio/rpmltc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.473 -r1.3501.2.474 CHANGES
--- rpm/CHANGES 17 Mar 2016 20:11:19 -0000 1.3501.2.473
+++ rpm/CHANGES 17 Mar 2016 21:44:13 -0000 1.3501.2.474
@@ -1,4 +1,5 @@
5.4.15 -> 5.4.16:
+ - jbj: ltc: fix: retrofit a #define for LTC_LTC_PKCS_1_V1_5 enum
detection.
- jbj: neon: fix: permit --with-ssl=gnutls.
- jbj: neon: upgrade to 0.30.1.
- jbj: mongoc: fix: permit building --without-openssl.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.134 -r2.472.2.135 configure.ac
--- rpm/configure.ac 15 Mar 2016 19:39:52 -0000 2.472.2.134
+++ rpm/configure.ac 17 Mar 2016 21:44:13 -0000 2.472.2.135
@@ -1910,6 +1910,9 @@
if test -d ${includedir}/tommath; then
CPPFLAGS="$CPPFLAGS -I${includedir}/tommath"
fi
+ AC_CHECK_DECL([LTC_PKCS_1_V1_5],
+ [ AC_DEFINE(USE_LTC_LTC_PKCS_1_V1_5, 1, [Define for older
LibTomCrypt])
+ ], [])
LIBS="$LIBS -ltommath"
], [])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmltc.c
============================================================================
$ cvs diff -u -r1.2.4.13 -r1.2.4.14 rpmltc.c
--- rpm/rpmio/rpmltc.c 9 Mar 2016 21:26:34 -0000 1.2.4.13
+++ rpm/rpmio/rpmltc.c 17 Mar 2016 21:44:14 -0000 1.2.4.14
@@ -379,7 +379,7 @@
unsigned char sig[4096]; /* XXX big enuf */
unsigned long siglen = sizeof(sig);
unsigned int dlen; /* XXX DSA */
-#if defined(LTC_LTC_PKCS_1_V1_5)
+#if defined(USE_LTC_LTC_PKCS_1_V1_5)
int _padding = LTC_LTC_PKCS_1_V1_5; /* XXX RSA */
#else
int _padding = LTC_PKCS_1_V1_5; /* XXX RSA */
@@ -448,7 +448,7 @@
unsigned char sig[2048];
unsigned long siglen = sizeof(sig);
unsigned int dlen; /* XXX DSA */
-#if defined(LTC_LTC_PKCS_1_V1_5)
+#if defined(USE_LTC_LTC_PKCS_1_V1_5)
int _padding = LTC_LTC_PKCS_1_V1_5; /* XXX RSA */
#else
int _padding = LTC_PKCS_1_V1_5; /* XXX RSA */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
