summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-05-23 11:48:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-25 10:29:09 +0100
commit4ed6dc560290ff3822b61b5ef2eba93e822d6109 (patch)
treeaa929c0035c3a1953a0d04dbdff10969d8f7123e /meta/recipes-devtools/rpm
parent12885620a86b529d7ebebe707ffe2b89390fb305 (diff)
downloadpoky-4ed6dc560290ff3822b61b5ef2eba93e822d6109.tar.gz
rpm: drop unused 0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch
* it was removed from SRC_URI in oe-core commit: commit 67257ca87c6fa8e6050a20ecea50daf834c7e869 Author: Alexander Kanavin <alex.kanavin@gmail.com> Date: Sat Apr 25 19:28:00 2020 +0200 Subject: rpm: upgrade to 4.15.1 and it's unused since then (From OE-Core rev: c801a215fb2d53bdec7f4c9a20ff7969e8071e5c) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch b/meta/recipes-devtools/rpm/files/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch
deleted file mode 100644
index 734e38bb39..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1From 2d53d1e308a5bd15a16cc289fa7e1f264ea706be Mon Sep 17 00:00:00 2001
2From: Panu Matilainen <pmatilai@redhat.com>
3Date: Tue, 26 Jun 2018 10:46:14 +0300
4Subject: [PATCH] Rip out partial support for unused MD2 and RIPEMD160 digests
5
6Inspired by #453, adding configure-checks for unused digests algorithms
7seems nonsensical, at no point in rpm history have these algorithms been
8used for anything in rpm so there's not even backward compatibility to
9care about. So the question becomes why do we appear to have (some)
10support for those unused algorithms? So lets don't, problem solved...
11
12Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ff4b9111aeba01dd025dd133ce617fb80f7398a0]
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14---
15 rpmio/digest_beecrypt.c | 7 -------
16 rpmio/digest_nss.c | 2 --
17 rpmio/digest_openssl.c | 6 ------
18 3 files changed, 15 deletions(-)
19
20diff --git a/rpmio/digest_beecrypt.c b/rpmio/digest_beecrypt.c
21index 597027e25..653a39491 100644
22--- a/rpmio/digest_beecrypt.c
23+++ b/rpmio/digest_beecrypt.c
24@@ -132,10 +132,6 @@ DIGEST_CTX rpmDigestInit(int hashalgo, rpmDigestFlags flags)
25 ctx->Digest = (void *) sha512Digest;
26 break;
27 #endif
28- case PGPHASHALGO_RIPEMD160:
29- case PGPHASHALGO_MD2:
30- case PGPHASHALGO_TIGER192:
31- case PGPHASHALGO_HAVAL_5_160:
32 default:
33 free(ctx);
34 return NULL;
35@@ -292,9 +288,6 @@ static int pgpVerifySigRSA(pgpDigAlg pgpkey, pgpDigAlg pgpsig, uint8_t *hash, si
36 case PGPHASHALGO_SHA1:
37 prefix = "3021300906052b0e03021a05000414";
38 break;
39- case PGPHASHALGO_MD2:
40- prefix = "3020300c06082a864886f70d020205000410";
41- break;
42 case PGPHASHALGO_SHA256:
43 prefix = "3031300d060960864801650304020105000420";
44 break;
45diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c
46index e11920e3e..b3d2b5595 100644
47--- a/rpmio/digest_nss.c
48+++ b/rpmio/digest_nss.c
49@@ -117,7 +117,6 @@ static HASH_HashType getHashType(int hashalgo)
50 {
51 switch (hashalgo) {
52 case PGPHASHALGO_MD5: return HASH_AlgMD5;
53- case PGPHASHALGO_MD2: return HASH_AlgMD2;
54 case PGPHASHALGO_SHA1: return HASH_AlgSHA1;
55 #ifdef SHA224_LENGTH
56 case PGPHASHALGO_SHA224: return HASH_AlgSHA224;
57@@ -217,7 +216,6 @@ static SECOidTag getHashAlg(unsigned int hashalgo)
58 {
59 switch (hashalgo) {
60 case PGPHASHALGO_MD5: return SEC_OID_MD5;
61- case PGPHASHALGO_MD2: return SEC_OID_MD2;
62 case PGPHASHALGO_SHA1: return SEC_OID_SHA1;
63 #ifdef SHA224_LENGTH
64 case PGPHASHALGO_SHA224: return SEC_OID_SHA224;
65diff --git a/rpmio/digest_openssl.c b/rpmio/digest_openssl.c
66index 18e52a724..0ae48dd1d 100644
67--- a/rpmio/digest_openssl.c
68+++ b/rpmio/digest_openssl.c
69@@ -172,12 +172,6 @@ static const EVP_MD *getEVPMD(int hashalgo)
70 case PGPHASHALGO_SHA1:
71 return EVP_sha1();
72
73- case PGPHASHALGO_RIPEMD160:
74- return EVP_ripemd160();
75-
76- case PGPHASHALGO_MD2:
77- return EVP_md2();
78-
79 case PGPHASHALGO_SHA256:
80 return EVP_sha256();
81