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-May-2014 07:59:26
Branch: rpm-5_4 Handle: 2014050305592402
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio rpmbc.c rpmgc.c rpmltc.c rpmnss.c rpmpgp.c
rpmpgp.h rpmssl.c
Log:
- pgp: add crypto stack identifier, use with base64 armor.
Summary:
Revision Changes Path
1.3501.2.376+1 -0 rpm/CHANGES
2.35.2.5 +1 -0 rpm/rpmio/rpmbc.c
2.34.2.8 +1 -0 rpm/rpmio/rpmgc.c
1.2.4.6 +1 -0 rpm/rpmio/rpmltc.c
1.40.2.11 +1 -0 rpm/rpmio/rpmnss.c
2.127.2.9 +8 -1 rpm/rpmio/rpmpgp.c
2.108.2.9 +1 -0 rpm/rpmio/rpmpgp.h
2.42.2.8 +1 -0 rpm/rpmio/rpmssl.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.375 -r1.3501.2.376 CHANGES
--- rpm/CHANGES 3 May 2014 05:46:58 -0000 1.3501.2.375
+++ rpm/CHANGES 3 May 2014 05:59:24 -0000 1.3501.2.376
@@ -1,4 +1,5 @@
5.4.14 -> 5.4.15:
+ - jbj: pgp: add crypto stack identifier, use with base64 armor.
- jbj: ssl: fix: follow openssl hash disabler conventions (Mark Hatle).
- jbj: autoFu: fix: chk libcrypto, not libopenssl, for symbol (Mark
Hatle).
- jbj: pgp: rework DSA/SHA1 in order to support DSA2 signatures.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbc.c
============================================================================
$ cvs diff -u -r2.35.2.4 -r2.35.2.5 rpmbc.c
--- rpm/rpmio/rpmbc.c 25 Apr 2014 02:43:40 -0000 2.35.2.4
+++ rpm/rpmio/rpmbc.c 3 May 2014 05:59:26 -0000 2.35.2.5
@@ -865,6 +865,7 @@
}
struct pgpImplVecs_s rpmbcImplVecs = {
+ "BeeCrypt 4.2.1", /* XXX FIXME: add version string to beecrypt */
rpmbcSetRSA,
rpmbcSetDSA,
rpmbcSetELG,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgc.c
============================================================================
$ cvs diff -u -r2.34.2.7 -r2.34.2.8 rpmgc.c
--- rpm/rpmio/rpmgc.c 25 Apr 2014 02:35:34 -0000 2.34.2.7
+++ rpm/rpmio/rpmgc.c 3 May 2014 05:59:26 -0000 2.34.2.8
@@ -1112,6 +1112,7 @@
}
struct pgpImplVecs_s rpmgcImplVecs = {
+ "Gcrypt " GCRYPT_VERSION,
rpmgcSetRSA,
rpmgcSetDSA,
rpmgcSetELG,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmltc.c
============================================================================
$ cvs diff -u -r1.2.4.5 -r1.2.4.6 rpmltc.c
--- rpm/rpmio/rpmltc.c 25 Apr 2014 02:41:22 -0000 1.2.4.5
+++ rpm/rpmio/rpmltc.c 3 May 2014 05:59:26 -0000 1.2.4.6
@@ -905,6 +905,7 @@
}
struct pgpImplVecs_s rpmltcImplVecs = {
+ "TomCrypt " SCRYPT,
rpmltcSetRSA,
rpmltcSetDSA,
rpmltcSetELG,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmnss.c
============================================================================
$ cvs diff -u -r1.40.2.10 -r1.40.2.11 rpmnss.c
--- rpm/rpmio/rpmnss.c 25 Apr 2014 02:37:46 -0000 1.40.2.10
+++ rpm/rpmio/rpmnss.c 3 May 2014 05:59:26 -0000 1.40.2.11
@@ -1568,6 +1568,7 @@
}
struct pgpImplVecs_s rpmnssImplVecs = {
+ "NSS " NSS_VERSION,
rpmnssSetRSA,
rpmnssSetDSA,
rpmnssSetELG,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.c
============================================================================
$ cvs diff -u -r2.127.2.8 -r2.127.2.9 rpmpgp.c
--- rpm/rpmio/rpmpgp.c 25 Apr 2014 20:19:34 -0000 2.127.2.8
+++ rpm/rpmio/rpmpgp.c 3 May 2014 05:59:26 -0000 2.127.2.9
@@ -1703,7 +1703,14 @@
/*@-globs@*/
t = stpcpy( stpcpy(t, "-----\nVersion: RPM "), VERSION);
/*@=globs@*/
- t = stpcpy(t, " (BeeCrypt)\n\n");
+
+ if (pgpImplVecs->_pgpNV && pgpImplVecs->_pgpNV[0]) {
+ t = stpcpy(t, " (");
+ t = stpcpy(t, pgpImplVecs->_pgpNV);
+ t = stpcpy(t, ")");
+ }
+
+ t = stpcpy(t, "\n\n");
if ((enc = b64encode(s, ns)) != NULL) {
t = stpcpy(t, enc);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.h
============================================================================
$ cvs diff -u -r2.108.2.8 -r2.108.2.9 rpmpgp.h
--- rpm/rpmio/rpmpgp.h 25 Apr 2014 20:19:34 -0000 2.108.2.8
+++ rpm/rpmio/rpmpgp.h 3 May 2014 05:59:26 -0000 2.108.2.9
@@ -1710,6 +1710,7 @@
/**
*/
typedef struct pgpImplVecs_s {
+ const char * _pgpNV;
pgpImplSet_t _pgpSetRSA;
pgpImplSet_t _pgpSetDSA;
pgpImplSet_t _pgpSetELG;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmssl.c
============================================================================
$ cvs diff -u -r2.42.2.7 -r2.42.2.8 rpmssl.c
--- rpm/rpmio/rpmssl.c 3 May 2014 05:46:59 -0000 2.42.2.7
+++ rpm/rpmio/rpmssl.c 3 May 2014 05:59:26 -0000 2.42.2.8
@@ -792,6 +792,7 @@
}
struct pgpImplVecs_s rpmsslImplVecs = {
+ OPENSSL_VERSION_TEXT,
rpmsslSetRSA,
rpmsslSetDSA,
rpmsslSetELG,
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
