tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle a couple more OpenSSL no-ecc cases. 

ok djm@
This commit is contained in:
Darren Tucker 2023-07-25 13:00:22 +10:00
parent edc2ef4e41
commit 5f83342b61
No known key found for this signature in database
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh-pkcs11-client.c
View File

@ -103,10 +103,10 @@ helper_by_rsa(const RSA *rsa)
} }
#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW)
static struct helper * static struct helper *
helper_by_ec(const EC_KEY *ec) helper_by_ec(const EC_KEY *ec)
{ {
#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW)
size_t i; size_t i;
const EC_KEY_METHOD *meth; 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) if (helpers[i] != NULL && helpers[i]->ec_meth == meth)
return helpers[i]; return helpers[i];
} }
#endif /* defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW) */
return NULL; return NULL;
} }
#endif /* defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW) */
static void static void
helper_free(struct helper *helper) helper_free(struct helper *helper)
@ -489,7 +489,9 @@ pkcs11_start_helper(const char *path)
close(pair[0]); close(pair[0]);
close(pair[1]); close(pair[1]);
RSA_meth_free(helper->rsa_meth); RSA_meth_free(helper->rsa_meth);
#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW)
EC_KEY_METHOD_free(helper->ec_meth); EC_KEY_METHOD_free(helper->ec_meth);
#endif
free(helper); free(helper);
return NULL; return NULL;
} else if (pid == 0) { } else if (pid == 0) {