From: Shane Lontis <shane.lontis@oracle.com>
Date: Fri, 1 May 2020 00:31:27 +0000 (+1000)
Subject: Add OIDS for md4 and ripemd160 to der_rsa
X-Git-Tag: openssl-3.0.0-alpha2~66
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3bf26eb335a0b4613fa1dd844afb146ba0b8b959;p=oweals%2Fopenssl.git

Add OIDS for md4 and ripemd160 to der_rsa

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11696)
---

diff --git a/providers/common/der/RSA.asn1 b/providers/common/der/RSA.asn1
index 7bce636029..66511be50e 100644
--- a/providers/common/der/RSA.asn1
+++ b/providers/common/der/RSA.asn1
@@ -86,3 +86,14 @@ id-rsassa-pkcs1-v1_5-with-sha3-224 OBJECT IDENTIFIER ::= { sigAlgs 13 }
 id-rsassa-pkcs1-v1_5-with-sha3-256 OBJECT IDENTIFIER ::= { sigAlgs 14 }
 id-rsassa-pkcs1-v1_5-with-sha3-384 OBJECT IDENTIFIER ::= { sigAlgs 15 }
 id-rsassa-pkcs1-v1_5-with-sha3-512 OBJECT IDENTIFIER ::= { sigAlgs 16 }
+
+
+-- -------------------------------------------------------------------
+-- These OID's exist in the codebase but may need to be deprecated at some point.
+-- mdc2 and md5_sha1 have been omitted as they do not look like valid entries.
+
+md4WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 3 }
+
+ripemd160WithRSAEncryption    OBJECT IDENTIFIER ::= {
+    iso(1) identified-organization(3) teletrust(36) algorithm(3) signatureAlgorithm(3) rsaSignature(1) 2
+}
diff --git a/providers/common/der/der_rsa.c.in b/providers/common/der/der_rsa.c.in
index 5abf079398..cdff722818 100644
--- a/providers/common/der/der_rsa.c.in
+++ b/providers/common/der/der_rsa.c.in
@@ -53,6 +53,9 @@ int DER_w_algorithmIdentifier_RSA_with(WPACKET *pkt, int tag,
 #ifndef FIPS_MODULE
         MD_CASE(md2);
         MD_CASE(md5);
+        MD_CASE(md4);
+        MD_CASE(ripemd160);
+/* TODO(3.0) Decide what to do about mdc2 and md5_sha1 */
 #endif
         MD_CASE(sha1);
         MD_CASE(sha224);