[openssl] master update

[tomas]

The branch master has been updated
       via  cf1a231d44db81f8565ecae5498a4f1f6f0168c9 (commit)
      from  e82fc27bcd34f246e1acd42a61e8ba62907e1d19 (commit)


- Log -----------------------------------------------------------------
commit cf1a231d44db81f8565ecae5498a4f1f6f0168c9
Author: Tomas Mraz <to...@openssl.org>
Date:   Thu Sep 9 09:12:22 2021 +0200

    dh_ameth: Fix dh_cmp_parameters to really compare the params
    
    This is legacy DH PKEY only code.
    
    Fixes #16562
    
    Reviewed-by: Paul Dale <pa...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16568)

-----------------------------------------------------------------------

Summary of changes:
 crypto/dh/dh_ameth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 0e577177ec..38d8e7a38f 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -311,7 +311,7 @@ static int dh_security_bits(const EVP_PKEY *pkey)
 
 static int dh_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
 {
-    return ossl_ffc_params_cmp(&a->pkey.dh->params, &a->pkey.dh->params,
+    return ossl_ffc_params_cmp(&a->pkey.dh->params, &b->pkey.dh->params,
                                a->ameth != &ossl_dhx_asn1_meth);
 }