Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 2d53d1e308a5bd15a16cc289fa7e1f264ea706be Mon Sep 17 00:00:00 2001 |
| 2 | From: Panu Matilainen <pmatilai@redhat.com> |
| 3 | Date: Tue, 26 Jun 2018 10:46:14 +0300 |
| 4 | Subject: [PATCH] Rip out partial support for unused MD2 and RIPEMD160 digests |
| 5 | |
| 6 | Inspired by #453, adding configure-checks for unused digests algorithms |
| 7 | seems nonsensical, at no point in rpm history have these algorithms been |
| 8 | used for anything in rpm so there's not even backward compatibility to |
| 9 | care about. So the question becomes why do we appear to have (some) |
| 10 | support for those unused algorithms? So lets don't, problem solved... |
| 11 | |
| 12 | Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ff4b9111aeba01dd025dd133ce617fb80f7398a0] |
| 13 | Signed-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 | |
| 20 | diff --git a/rpmio/digest_beecrypt.c b/rpmio/digest_beecrypt.c |
| 21 | index 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; |
| 45 | diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c |
| 46 | index 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; |
| 65 | diff --git a/rpmio/digest_openssl.c b/rpmio/digest_openssl.c |
| 66 | index 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 | |