diff options
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r-- | openbsd-compat/openssl-compat.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 0fbf60df4..28e4fc360 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -21,6 +21,7 @@ | |||
21 | #ifdef WITH_OPENSSL | 21 | #ifdef WITH_OPENSSL |
22 | 22 | ||
23 | #include <openssl/opensslv.h> | 23 | #include <openssl/opensslv.h> |
24 | #include <openssl/crypto.h> | ||
24 | #include <openssl/evp.h> | 25 | #include <openssl/evp.h> |
25 | #include <openssl/rsa.h> | 26 | #include <openssl/rsa.h> |
26 | #include <openssl/dsa.h> | 27 | #include <openssl/dsa.h> |
@@ -33,12 +34,18 @@ int ssh_compatible_openssl(long, long); | |||
33 | # error OpenSSL 0.9.8f or greater is required | 34 | # error OpenSSL 0.9.8f or greater is required |
34 | #endif | 35 | #endif |
35 | 36 | ||
36 | #if OPENSSL_VERSION_NUMBER < 0x10100000L | 37 | #ifndef OPENSSL_VERSION |
37 | # define OpenSSL_version_num SSLeay | ||
38 | # define OpenSSL_version SSLeay_version | ||
39 | # define OPENSSL_VERSION SSLEAY_VERSION | 38 | # define OPENSSL_VERSION SSLEAY_VERSION |
40 | #endif | 39 | #endif |
41 | 40 | ||
41 | #ifndef HAVE_OPENSSL_VERSION | ||
42 | # define OpenSSL_version(x) SSLeay_version(x) | ||
43 | #endif | ||
44 | |||
45 | #ifndef HAVE_OPENSSL_VERSION_NUM | ||
46 | # define OpenSSL_version_num SSLeay | ||
47 | #endif | ||
48 | |||
42 | #if OPENSSL_VERSION_NUMBER < 0x10000001L | 49 | #if OPENSSL_VERSION_NUMBER < 0x10000001L |
43 | # define LIBCRYPTO_EVP_INL_TYPE unsigned int | 50 | # define LIBCRYPTO_EVP_INL_TYPE unsigned int |
44 | #else | 51 | #else |