[openssl] master update
tomas at openssl.org
tomas at openssl.org
Fri Jan 14 16:16:33 UTC 2022
The branch master has been updated
via 37b850738cbab74413d41033b2a4df1d69e1fa4a (commit)
from 71396cd048072b69559b46d98cfebfd4474cd712 (commit)
- Log -----------------------------------------------------------------
commit 37b850738cbab74413d41033b2a4df1d69e1fa4a
Author: manison <manison at users.noreply.github.com>
Date: Wed Jan 12 20:53:48 2022 +0100
EVP: fix evp_keymgmt_util_match so that it actually tries cross export the other way if the first attempt fails
Fixes #17482
CLA: trivial
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17487)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/keymgmt_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c
index 2a73e9a2be..05c4e97957 100644
--- a/crypto/evp/keymgmt_lib.c
+++ b/crypto/evp/keymgmt_lib.c
@@ -370,7 +370,7 @@ int evp_keymgmt_util_match(EVP_PKEY *pk1, EVP_PKEY *pk2, int selection)
* but also to determine if we should attempt a cross export
* the other way. There's no point doing it both ways.
*/
- int ok = 1;
+ int ok = 0;
/* Complex case, where the keymgmt differ */
if (keymgmt1 != NULL
More information about the openssl-commits
mailing list