RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Nov-2007 18:41:34
Branch: HEAD Handle: 2007111717413400
Modified files:
rpm CHANGES system.h
rpm/rpmdb signature.c
Log:
- jbj: Eliminate SUPPORT_RPMV3_SIGN_{RSA,DSA} header+payload
signatures.
Summary:
Revision Changes Path
1.1837 +1 -0 rpm/CHANGES
1.26 +7 -27 rpm/rpmdb/signature.c
2.100 +0 -2 rpm/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1836 -r1.1837 CHANGES
--- rpm/CHANGES 17 Nov 2007 17:28:30 -0000 1.1836
+++ rpm/CHANGES 17 Nov 2007 17:41:34 -0000 1.1837
@@ -1,4 +1,5 @@
5.0a1 -> 5.0a2:
+ - jbj: Eliminate SUPPORT_RPMV3_SIGN_{RSA,DSA} header+payload signatures.
- jbj: Eliminate SUPPORT_PGP_SIGNING signing with pgp/pgp5 code.
- jbj: Eliminate SUPPORT_RPMV3_BORKEN busted md5 digest tag code.
- jbj: revert the noisy tag data type validation. explicit typing for
5.0.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/signature.c
============================================================================
$ cvs diff -u -r1.25 -r1.26 signature.c
--- rpm/rpmdb/signature.c 17 Nov 2007 17:28:31 -0000 1.25
+++ rpm/rpmdb/signature.c 17 Nov 2007 17:41:34 -0000 1.26
@@ -268,24 +268,13 @@
/* Identify the type of signature being returned. */
switch (*sigTagp) {
+ default:
+assert(0); /* XXX never happens. */
+ /[EMAIL PROTECTED]@*/ break;
case RPMSIGTAG_SIZE:
case RPMSIGTAG_MD5:
case RPMSIGTAG_SHA1:
break;
-#if defined(SUPPORT_RPMV3_SIGN_DSA) || defined(SUPPORT_RPMV3_SIGN_RSA)
- case RPMSIGTAG_GPG:
- /* XXX check hash algorithm too? */
- if (sigp->pubkey_algo == PGPPUBKEYALGO_RSA)
- *sigTagp = RPMSIGTAG_PGP;
- break;
-#endif
-#if defined(SUPPORT_RPMV3_SIGN_DSA) || defined(SUPPORT_RPMV3_SIGN_RSA)
- case RPMSIGTAG_PGP5: /* XXX legacy */
- case RPMSIGTAG_PGP:
- if (sigp->pubkey_algo == PGPPUBKEYALGO_DSA)
- *sigTagp = RPMSIGTAG_GPG;
- break;
-#endif
case RPMSIGTAG_DSA:
/* XXX check hash algorithm too? */
if (sigp->pubkey_algo == PGPPUBKEYALGO_RSA)
@@ -427,6 +416,9 @@
int xx;
switch (sigTag) {
+ default:
+assert(0); /* XXX never happens. */
+ /[EMAIL PROTECTED]@*/ break;
case RPMSIGTAG_SIZE:
if (Stat(file, &st) != 0)
break;
@@ -441,7 +433,7 @@
ret = 0;
break;
case RPMSIGTAG_MD5:
- pktlen = 16;
+ pktlen = 128/8;
pkt = memset(alloca(pktlen), 0, pktlen);
if (dodigest(PGPHASHALGO_MD5, file, (unsigned char *)pkt, 0, NULL))
break;
@@ -455,18 +447,6 @@
ret = 0;
break;
case RPMSIGTAG_GPG:
-#if defined(SUPPORT_RPMV3_SIGN_DSA)
- if (makeGPGSignature(file, &sigTag, &pkt, &pktlen, passPhrase))
- break;
- he->tag = sigTag;
- he->t = RPM_BIN_TYPE;
- he->p.ptr = pkt;
- he->c = pktlen;
- xx = hae(sigh, he, 0);
- if (!xx)
- break;
- /* XXX Piggyback a header-only DSA signature as well. */
-#endif
ret = makeHDRSignature(sigh, file, RPMSIGTAG_DSA, passPhrase);
break;
case RPMSIGTAG_RSA:
@@ .
patch -p0 <<'@@ .'
Index: rpm/system.h
============================================================================
$ cvs diff -u -r2.99 -r2.100 system.h
--- rpm/system.h 17 Nov 2007 17:28:30 -0000 2.99
+++ rpm/system.h 17 Nov 2007 17:41:34 -0000 2.100
@@ -729,8 +729,6 @@
* Phase out RPMv3 header+payload issues.
*/
#if 0
-#define SUPPORT_RPMV3_SIGN_RSA 1
-#define SUPPORT_RPMV3_SIGN_DSA 1
#define SUPPORT_RPMV3_BASENAMES_HACKS 1
#define SUPPORT_RPMV3_PROVIDE_SELF 1
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
