teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame rpm-4.14-disable-sha256hdr.patch

Panu Matilainen 14f55d
diff --git a/lib/signature.c b/lib/signature.c
Panu Matilainen 14f55d
index b91baf628..ddfa969c9 100644
Panu Matilainen 14f55d
--- a/lib/signature.c
Panu Matilainen 14f55d
+++ b/lib/signature.c
Panu Matilainen 14f55d
@@ -120,6 +120,7 @@ rpmRC rpmGenerateSignature(char *SHA256, char *SHA1, uint8_t *MD5,
Panu Matilainen 14f55d
     int gpgSize = rpmExpandNumeric("%{__gpg_reserved_space}");
Panu Matilainen 14f55d
 
Panu Matilainen 14f55d
     /* Prepare signature */
Panu Matilainen 14f55d
+#if 0 /* rpm 4.13.x signature checking trips up on this, disable temporarily */
Panu Matilainen 14f55d
     if (SHA256) {
Panu Matilainen 14f55d
 	rpmtdReset(&td);
Panu Matilainen 14f55d
 	td.tag = RPMSIGTAG_SHA256;
Panu Matilainen 14f55d
@@ -128,6 +129,7 @@ rpmRC rpmGenerateSignature(char *SHA256, char *SHA1, uint8_t *MD5,
Panu Matilainen 14f55d
 	td.data = SHA256;
Panu Matilainen 14f55d
 	headerPut(sig, &td, HEADERPUT_DEFAULT);
Panu Matilainen 14f55d
     }
Panu Matilainen 14f55d
+#endif
Panu Matilainen 14f55d
 
Panu Matilainen 14f55d
     if (SHA1) {
Panu Matilainen 14f55d
 	rpmtdReset(&td);
Panu Matilainen 14f55d
diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at
Panu Matilainen 14f55d
index bf6bfd01a..75b9bc110 100644
Panu Matilainen 14f55d
--- a/tests/rpmsigdig.at
Panu Matilainen 14f55d
+++ b/tests/rpmsigdig.at
Panu Matilainen 14f55d
@@ -123,7 +123,6 @@ runroot rpmkeys -Kv /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
Panu Matilainen 14f55d
 [0],
Panu Matilainen 14f55d
 [/build/RPMS/noarch/attrtest-1.0-1.noarch.rpm:
Panu Matilainen 14f55d
     Header SHA1 digest: OK
Panu Matilainen 14f55d
-    Header SHA256 digest: OK
Panu Matilainen 14f55d
     Payload SHA256 digest: OK
Panu Matilainen 14f55d
     MD5 digest: OK
Panu Matilainen 14f55d
 ],