diff options
| author | Damien Miller <djm@mindrot.org> | 2010-05-12 09:49:59 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-05-12 09:49:59 +0200 |
| commit | 4b1ec8381b1f459011cb61a6421e7cc45949cc60 (patch) | |
| tree | 2dfa43b7d23b086640a4ad75c505d4903d262025 /openbsd-compat/openssl-compat.h | |
| parent | - (dtucker) [Makefile.in] Bug #1770: Link libopenbsd-compat twice to solve (diff) | |
| download | openssh-4b1ec8381b1f459011cb61a6421e7cc45949cc60.tar.xz openssh-4b1ec8381b1f459011cb61a6421e7cc45949cc60.zip | |
- (djm) [openbsd-compat/openssl-compat.h] Fix build breakage on older
libcrypto by defining OPENSSL_[DR]SA_MAX_MODULUS_BITS if they aren't
already. ok dtucker@
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 @@ -/* $Id: openssl-compat.h,v 1.14 2009/03/07 11:22:35 dtucker Exp $ */ +/* $Id: openssl-compat.h,v 1.15 2010/05/12 07:50:02 djm Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -18,6 +18,16 @@ #include "includes.h" #include <openssl/evp.h> +#include <openssl/rsa.h> +#include <openssl/dsa.h> + +/* Only in 0.9.8 */ +#ifndef OPENSSL_DSA_MAX_MODULUS_BITS +# define OPENSSL_DSA_MAX_MODULUS_BITS 10000 +#endif +#ifndef OPENSSL_RSA_MAX_MODULUS_BITS +# define OPENSSL_RSA_MAX_MODULUS_BITS 16384 +#endif /* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */ #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f) @@ -97,3 +107,4 @@ int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); void ssh_SSLeay_add_all_algorithms(void); #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ + |