From: Matt Caswell <matt@openssl.org>
Date: Tue, 15 Oct 2019 12:27:21 +0000 (+0100)
Subject: Correctly handle SSL3 Master Secret when calling providers
X-Git-Tag: openssl-3.0.0-alpha1~1139
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c3885102f59dd7313597d1405babd06f75a94f8c;p=oweals%2Fopenssl.git

Correctly handle SSL3 Master Secret when calling providers

We need to pass the SSL3 Master Secret down to the provider code in order
for SSLv3 to work correctly.

Fixes #10182

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10186)
---

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 5ff43fdd64..c2a6e83ad5 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -675,6 +675,10 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
         params[0] = OSSL_PARAM_construct_utf8_string(OSSL_DIGEST_PARAM_MICALG,
                                                      p2, p1 ? p1 : 9999);
         break;
+    case EVP_CTRL_SSL3_MASTER_SECRET:
+        params[0] = OSSL_PARAM_construct_octet_string(OSSL_DIGEST_PARAM_SSL3_MS,
+                                                      p2, p1);
+        break;
     default:
         return EVP_CTRL_RET_UNSUPPORTED;
     }