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:16:55
Branch: HEAD Handle: 2007111717165401
Modified files:
rpm CHANGES system.h
rpm/lib rpmchecksig.c
rpm/rpmdb hdrNVR.c signature.c
Log:
- jbj: Eliminate SUPPORT_RPMV3_BORKEN busted md5 digest tag code.
Summary:
Revision Changes Path
1.1835 +1 -0 rpm/CHANGES
1.180 +0 -12 rpm/lib/rpmchecksig.c
1.33 +0 -16 rpm/rpmdb/hdrNVR.c
1.24 +0 -7 rpm/rpmdb/signature.c
2.98 +0 -1 rpm/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1834 -r1.1835 CHANGES
--- rpm/CHANGES 17 Nov 2007 16:56:20 -0000 1.1834
+++ rpm/CHANGES 17 Nov 2007 17:16:54 -0000 1.1835
@@ -1,4 +1,5 @@
5.0a1 -> 5.0a2:
+ - jbj: Eliminate SUPPORT_RPMV3_BORKEN busted md5 digest tag code.
- jbj: revert the noisy tag data type validation. explicit typing for
5.0.
- jbj: add HEADERFLAG_SIGNATURE, revert he->signature access markers.
- afb: upgrade internal rsyncable zlib, from 1.2.2.4 to 1.2.3
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmchecksig.c
============================================================================
$ cvs diff -u -r1.179 -r1.180 rpmchecksig.c
--- rpm/lib/rpmchecksig.c 17 Nov 2007 16:56:21 -0000 1.179
+++ rpm/lib/rpmchecksig.c 17 Nov 2007 17:16:54 -0000 1.180
@@ -1069,10 +1069,6 @@
if (!nosignatures && she->tag == RPMSIGTAG_DSA)
continue;
/[EMAIL PROTECTED]@*/ break;
-#if defined(SUPPORT_RPMV3_BROKEN)
- case RPMSIGTAG_LEMD5_2:
- case RPMSIGTAG_LEMD5_1:
-#endif
case RPMSIGTAG_MD5:
if (nodigests)
continue;
@@ -1110,10 +1106,6 @@
b = stpcpy(b, "SHA1 ");
res2 = 1;
/[EMAIL PROTECTED]@*/ break;
-#if defined(SUPPORT_RPMV3_BROKEN)
- case RPMSIGTAG_LEMD5_2:
- case RPMSIGTAG_LEMD5_1:
-#endif
case RPMSIGTAG_MD5:
b = stpcpy(b, "MD5 ");
res2 = 1;
@@ -1199,10 +1191,6 @@
case RPMSIGTAG_SHA1:
b = stpcpy(b, "sha1 ");
/[EMAIL PROTECTED]@*/ break;
-#if defined(SUPPORT_RPMV3_BROKEN)
- case RPMSIGTAG_LEMD5_2:
- case RPMSIGTAG_LEMD5_1:
-#endif
case RPMSIGTAG_MD5:
b = stpcpy(b, "md5 ");
/[EMAIL PROTECTED]@*/ break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrNVR.c
============================================================================
$ cvs diff -u -r1.32 -r1.33 hdrNVR.c
--- rpm/rpmdb/hdrNVR.c 14 Nov 2007 23:56:33 -0000 1.32
+++ rpm/rpmdb/hdrNVR.c 17 Nov 2007 17:16:55 -0000 1.33
@@ -242,14 +242,6 @@
case RPMSIGTAG_SIZE:
he->tag = RPMTAG_SIGSIZE;
/[EMAIL PROTECTED]@*/ break;
-#if defined(SUPPORT_RPMV3_BROKEN)
- case RPMSIGTAG_LEMD5_1:
- he->tag = RPMTAG_SIGLEMD5_1;
- /[EMAIL PROTECTED]@*/ break;
- case RPMSIGTAG_LEMD5_2:
- he->tag = RPMTAG_SIGLEMD5_2;
- /[EMAIL PROTECTED]@*/ break;
-#endif
#if defined(SUPPORT_RPMV3_VERIFY_RSA)
case RPMSIGTAG_PGP:
he->tag = RPMTAG_SIGPGP;
@@ -330,14 +322,6 @@
case RPMTAG_SIGSIZE:
he->tag = RPMSIGTAG_SIZE;
/[EMAIL PROTECTED]@*/ break;
-#if defined(SUPPORT_RPMV3_BROKEN)
- case RPMTAG_SIGLEMD5_1:
- he->tag = RPMSIGTAG_LEMD5_1;
- /[EMAIL PROTECTED]@*/ break;
- case RPMTAG_SIGLEMD5_2:
- he->tag = RPMSIGTAG_LEMD5_2;
- /[EMAIL PROTECTED]@*/ break;
-#endif
#if defined(SUPPORT_RPMV3_VERIFY_RSA)
case RPMTAG_SIGPGP:
he->tag = RPMSIGTAG_PGP;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/signature.c
============================================================================
$ cvs diff -u -r1.23 -r1.24 signature.c
--- rpm/rpmdb/signature.c 17 Nov 2007 16:56:21 -0000 1.23
+++ rpm/rpmdb/signature.c 17 Nov 2007 17:16:55 -0000 1.24
@@ -1382,13 +1382,6 @@
res = verifyDSASignature(dig, result, dig->sha1ctx);
break;
#endif
-#if defined(SUPPORT_RPMV3_BROKEN)
- case RPMSIGTAG_LEMD5_1:
- case RPMSIGTAG_LEMD5_2:
- sprintf(result, _("Broken MD5 digest: UNSUPPORTED\n"));
- res = RPMRC_NOTFOUND;
- break;
-#endif
default:
sprintf(result, _("Signature: UNKNOWN (%u)\n"), (unsigned)sigtag);
res = RPMRC_NOTFOUND;
@@ .
patch -p0 <<'@@ .'
Index: rpm/system.h
============================================================================
$ cvs diff -u -r2.97 -r2.98 system.h
--- rpm/system.h 17 Nov 2007 16:56:20 -0000 2.97
+++ rpm/system.h 17 Nov 2007 17:16:54 -0000 2.98
@@ -729,7 +729,6 @@
* Phase out RPMv3 header+payload issues.
*/
#if 0
-#define SUPPORT_RPMV3_BROKEN 1
#define SUPPORT_RPMV3_SIGN_RSA 1
#define SUPPORT_RPMV3_SIGN_DSA 1
#define SUPPORT_RPMV3_BASENAMES_HACKS 1
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
