diff options
author | Eneas U de Queiroz <cote2004-github@yahoo.com> | 2018-10-09 16:17:42 -0300 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-11-09 14:19:24 +1100 |
commit | 624d19ac2d56fa86a22417c35536caceb3be346f (patch) | |
tree | 151568ee6e6277be2e00cdb8eda657bb6f92076a /openbsd-compat | |
parent | 1801cd11d99d05a66ab5248c0555f55909a355ce (diff) | |
download | openssh-git-624d19ac2d56fa86a22417c35536caceb3be346f.tar.gz |
fix compilation with openssl built without ECC
ECDSA code in openssh-compat.h and libressl-api-compat.c needs to be
guarded by OPENSSL_HAS_ECC
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/libressl-api-compat.c | 4 | ||||
-rw-r--r-- | openbsd-compat/openssl-compat.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/openbsd-compat/libressl-api-compat.c b/openbsd-compat/libressl-api-compat.c index de3e64a6..ae00ff59 100644 --- a/openbsd-compat/libressl-api-compat.c +++ b/openbsd-compat/libressl-api-compat.c @@ -152,7 +152,9 @@ #include <openssl/dsa.h> #include <openssl/rsa.h> #include <openssl/evp.h> +#ifdef OPENSSL_HAS_ECC #include <openssl/ecdsa.h> +#endif #include <openssl/dh.h> #ifndef HAVE_DSA_GET0_PQG @@ -417,6 +419,7 @@ DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s) } #endif /* HAVE_DSA_SIG_SET0 */ +#ifdef OPENSSL_HAS_ECC #ifndef HAVE_ECDSA_SIG_GET0 void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) @@ -442,6 +445,7 @@ ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) return 1; } #endif /* HAVE_ECDSA_SIG_SET0 */ +#endif /* OPENSSL_HAS_ECC */ #ifndef HAVE_DH_GET0_PQG void diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 94c750b7..1ae0fce2 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -25,7 +25,9 @@ #include <openssl/evp.h> #include <openssl/rsa.h> #include <openssl/dsa.h> +#ifdef OPENSSL_HAS_ECC #include <openssl/ecdsa.h> +#endif #include <openssl/dh.h> int ssh_compatible_openssl(long, long); @@ -174,6 +176,7 @@ void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps); int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s); #endif /* DSA_SIG_SET0 */ +#ifdef OPENSSL_HAS_ECC #ifndef HAVE_ECDSA_SIG_GET0 void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps); #endif /* HAVE_ECDSA_SIG_GET0 */ @@ -181,6 +184,7 @@ void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps); #ifndef HAVE_ECDSA_SIG_SET0 int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s); #endif /* HAVE_ECDSA_SIG_SET0 */ +#endif /* OPENSSL_HAS_ECC */ #ifndef HAVE_DH_GET0_PQG void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, |