diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
commit | 31e30b835fd9695d3b6647cab4867001b092e28f (patch) | |
tree | 138e715c25661825457c7280cd66e3f4853d474c /openbsd-compat/openssl-compat.h | |
parent | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff) | |
parent | 43094ebf14c9b16f1ea398bc5b65a7335e947288 (diff) |
merge 5.6p1
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r-- | openbsd-compat/openssl-compat.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index fcc762867..b7caa650c 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.14 2009/03/07 11:22:35 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.15 2010/05/12 07:50:02 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> | 4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> |
@@ -18,6 +18,16 @@ | |||
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | #include <openssl/evp.h> | 20 | #include <openssl/evp.h> |
21 | #include <openssl/rsa.h> | ||
22 | #include <openssl/dsa.h> | ||
23 | |||
24 | /* Only in 0.9.8 */ | ||
25 | #ifndef OPENSSL_DSA_MAX_MODULUS_BITS | ||
26 | # define OPENSSL_DSA_MAX_MODULUS_BITS 10000 | ||
27 | #endif | ||
28 | #ifndef OPENSSL_RSA_MAX_MODULUS_BITS | ||
29 | # define OPENSSL_RSA_MAX_MODULUS_BITS 16384 | ||
30 | #endif | ||
21 | 31 | ||
22 | /* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */ | 32 | /* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */ |
23 | #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f) | 33 | #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f) |
@@ -97,3 +107,4 @@ int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); | |||
97 | int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); | 107 | int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); |
98 | void ssh_SSLeay_add_all_algorithms(void); | 108 | void ssh_SSLeay_add_all_algorithms(void); |
99 | #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ | 109 | #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ |
110 | |||