diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2019-05-17 02:54:51 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-05-17 02:54:51 +0200 |
| commit | 97370f6c2c3b825f8c577b7e6c00b1a98d30a6cf (patch) | |
| tree | 217d73211fcf07d34c96c7294a295bbe589d81fd /ssh-pkcs11.c | |
| parent | Conditionalize ECDH methods in CA algos. (diff) | |
| download | openssh-97370f6c2c3b825f8c577b7e6c00b1a98d30a6cf.tar.xz openssh-97370f6c2c3b825f8c577b7e6c00b1a98d30a6cf.zip | |
Fix building w/out ECC.
Ifdef out ECC specific code so that that it'll build against an OpenSSL
configured w/out ECC. With & ok djm@
Diffstat (limited to 'ssh-pkcs11.c')
| -rw-r--r-- | ssh-pkcs11.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c index 24bbc5873..d9413bc4f 100644 --- a/ssh-pkcs11.c +++ b/ssh-pkcs11.c @@ -916,7 +916,9 @@ pkcs11_fetch_x509_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx, X509 *x509 = NULL; EVP_PKEY *evp; RSA *rsa = NULL; +#ifdef OPENSSL_HAS_ECC EC_KEY *ec = NULL; +#endif struct sshkey *key = NULL; int i; #ifdef HAVE_EC_KEY_METHOD_NEW @@ -1043,7 +1045,9 @@ fail: free(cert_attr[i].pValue); X509_free(x509); RSA_free(rsa); +#ifdef OPENSSL_HAS_ECC EC_KEY_free(ec); +#endif return (key); } |