From: Matt Caswell <matt@openssl.org>
Date: Thu, 27 Jun 2019 14:03:55 +0000 (+0100)
Subject: Enable PKCS#3 DH in the providers
X-Git-Tag: openssl-3.0.0-alpha1~1780
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=94b40fb77c4e345526c2aff1d8f8b9186fb4a179;p=oweals%2Fopenssl.git

Enable PKCS#3 DH in the providers

The default provider now has support for PKCS#3 Diffie-Hellman so we
switch libcrypto to using providers for that algorithm.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9266)
---

diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c
index 655d5a1c86..479cc0d42d 100644
--- a/crypto/evp/exchange.c
+++ b/crypto/evp/exchange.c
@@ -147,10 +147,8 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, EVP_KEYEXCH *exchange)
          */
         if (ctx->pkey != NULL) {
             switch (ctx->pkey->type) {
-#if 0
             case EVP_PKEY_DH:
                 break;
-#endif
             default:
                 goto legacy;
             }