diff options
| author | Damien Miller <djm@mindrot.org> | 2021-10-01 16:35:49 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-10-01 16:36:24 +1000 |
| commit | dee22129bbc61e25b1003adfa2bc584c5406ef2d (patch) | |
| tree | 138bb838f0f277c09dda7b9ac9ca31e52b024e4d /ssh-pkcs11-client.c | |
| parent | 872595572b6c9a584ed754165e8b7c4c9e7e1d61 (diff) | |
| download | openssh-git-dee22129bbc61e25b1003adfa2bc584c5406ef2d.tar.gz | |
make OPENSSL_HAS_ECC checks more thorough
ok dtucker
Diffstat (limited to 'ssh-pkcs11-client.c')
| -rw-r--r-- | ssh-pkcs11-client.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c index e7247369..cfd833d7 100644 --- a/ssh-pkcs11-client.c +++ b/ssh-pkcs11-client.c @@ -163,7 +163,7 @@ rsa_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa, int padding) return (ret); } -#ifdef HAVE_EC_KEY_METHOD_NEW +#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW) static ECDSA_SIG * ecdsa_do_sign(const unsigned char *dgst, int dgst_len, const BIGNUM *inv, const BIGNUM *rp, EC_KEY *ec) @@ -220,12 +220,12 @@ ecdsa_do_sign(const unsigned char *dgst, int dgst_len, const BIGNUM *inv, sshbuf_free(msg); return (ret); } -#endif /* HAVE_EC_KEY_METHOD_NEW */ +#endif /* OPENSSL_HAS_ECC && HAVE_EC_KEY_METHOD_NEW */ static RSA_METHOD *helper_rsa; -#ifdef HAVE_EC_KEY_METHOD_NEW +#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW) static EC_KEY_METHOD *helper_ecdsa; -#endif /* HAVE_EC_KEY_METHOD_NEW */ +#endif /* OPENSSL_HAS_ECC && HAVE_EC_KEY_METHOD_NEW */ /* redirect private key crypto operations to the ssh-pkcs11-helper */ static void @@ -233,10 +233,10 @@ wrap_key(struct sshkey *k) { if (k->type == KEY_RSA) RSA_set_method(k->rsa, helper_rsa); -#ifdef HAVE_EC_KEY_METHOD_NEW +#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW) else if (k->type == KEY_ECDSA) EC_KEY_set_method(k->ecdsa, helper_ecdsa); -#endif /* HAVE_EC_KEY_METHOD_NEW */ +#endif /* OPENSSL_HAS_ECC && HAVE_EC_KEY_METHOD_NEW */ else fatal_f("unknown key type"); } @@ -247,7 +247,7 @@ pkcs11_start_helper_methods(void) if (helper_rsa != NULL) return (0); -#ifdef HAVE_EC_KEY_METHOD_NEW +#if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW) int (*orig_sign)(int, const unsigned char *, int, unsigned char *, unsigned int *, const BIGNUM *, const BIGNUM *, EC_KEY *) = NULL; if (helper_ecdsa != NULL) @@ -257,7 +257,7 @@ pkcs11_start_helper_methods(void) return (-1); EC_KEY_METHOD_get_sign(helper_ecdsa, &orig_sign, NULL, NULL); EC_KEY_METHOD_set_sign(helper_ecdsa, orig_sign, NULL, ecdsa_do_sign); -#endif /* HAVE_EC_KEY_METHOD_NEW */ +#endif /* OPENSSL_HAS_ECC && HAVE_EC_KEY_METHOD_NEW */ if ((helper_rsa = RSA_meth_dup(RSA_get_default_method())) == NULL) fatal_f("RSA_meth_dup failed"); |