[openssh-commits] [openssh] 01/01: Handle a couple more OpenSSL no-ecc cases.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 5f83342b61d1f76c141de608ed2bd293990416bd
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Tue Jul 25 13:00:22 2023 +1000

    Handle a couple more OpenSSL no-ecc cases.
    
    ok djm@
---
 ssh-pkcs11-client.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c
index d9e3b59a..061b0681 100644
--- a/ssh-pkcs11-client.c
+++ b/ssh-pkcs11-client.c
@@ -103,10 +103,10 @@ helper_by_rsa(const RSA *rsa)
 
 }
 
+#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW)
 static struct helper *
 helper_by_ec(const EC_KEY *ec)
 {
-#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW)
 	size_t i;
 	const EC_KEY_METHOD *meth;
 
@@ -116,10 +116,10 @@ helper_by_ec(const EC_KEY *ec)
 		if (helpers[i] != NULL && helpers[i]->ec_meth == meth)
 			return helpers[i];
 	}
-#endif /* defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW) */
 	return NULL;
 
 }
+#endif /* defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW) */
 
 static void
 helper_free(struct helper *helper)
@@ -489,7 +489,9 @@ pkcs11_start_helper(const char *path)
 		close(pair[0]);
 		close(pair[1]);
 		RSA_meth_free(helper->rsa_meth);
+#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW)
 		EC_KEY_METHOD_free(helper->ec_meth);
+#endif
 		free(helper);
 		return NULL;
 	} else if (pid == 0) {

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.