diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | openbsd-compat/openssl-compat.c | 14 | ||||
-rw-r--r-- | openbsd-compat/openssl-compat.h | 6 |
4 files changed, 27 insertions, 5 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20110122 | ||
2 | - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] Add | ||
3 | RSA_get_default_method() for the benefit of openssl versions that don't | ||
4 | have it (at least openssl-engine-0.9.6b). Found and tested by Kevin Brott, | ||
5 | ok djm@. | ||
6 | |||
1 | 20110119 | 7 | 20110119 |
2 | - (tim) [contrib/caldera/openssh.spec] Use CFLAGS from Makefile instead | 8 | - (tim) [contrib/caldera/openssh.spec] Use CFLAGS from Makefile instead |
3 | of RPM so build completes. Signatures were changed to .asc since 4.1p1. | 9 | of RPM so build completes. Signatures were changed to .asc since 4.1p1. |
diff --git a/configure.ac b/configure.ac index 208896ed8..769e83594 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.468 2011/01/19 12:12:30 djm Exp $ | 1 | # $Id: configure.ac,v 1.469 2011/01/21 22:37:05 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) | 17 | AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) |
18 | AC_REVISION($Revision: 1.468 $) | 18 | AC_REVISION($Revision: 1.469 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | 20 | ||
21 | # local macros | 21 | # local macros |
@@ -2180,7 +2180,7 @@ int main(void) { SSLeay_add_all_algorithms(); } | |||
2180 | ] | 2180 | ] |
2181 | ) | 2181 | ) |
2182 | 2182 | ||
2183 | AC_CHECK_FUNCS(RSA_generate_key_ex DSA_generate_parameters_ex BN_is_prime_ex) | 2183 | AC_CHECK_FUNCS(RSA_generate_key_ex DSA_generate_parameters_ex BN_is_prime_ex RSA_get_default_method) |
2184 | 2184 | ||
2185 | AC_ARG_WITH(ssl-engine, | 2185 | AC_ARG_WITH(ssl-engine, |
2186 | [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ], | 2186 | [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ], |
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index eb5ae7f85..b617fdf19 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.c,v 1.12 2010/12/04 21:46:05 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.c,v 1.13 2011/01/21 22:37:06 dtucker 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> |
@@ -26,6 +26,10 @@ | |||
26 | # include <openssl/conf.h> | 26 | # include <openssl/conf.h> |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | #ifndef HAVE_RSA_GET_DEFAULT_METHOD | ||
30 | # include <openssl/rsa.h> | ||
31 | #endif | ||
32 | |||
29 | #include "log.h" | 33 | #include "log.h" |
30 | 34 | ||
31 | #define SSH_DONT_OVERLOAD_OPENSSL_FUNCS | 35 | #define SSH_DONT_OVERLOAD_OPENSSL_FUNCS |
@@ -120,6 +124,14 @@ DSA_generate_parameters_ex(DSA *dsa, int bits, const unsigned char *seed, | |||
120 | } | 124 | } |
121 | #endif | 125 | #endif |
122 | 126 | ||
127 | #ifndef HAVE_RSA_GET_DEFAULT_METHOD | ||
128 | RSA_METHOD * | ||
129 | RSA_get_default_method(void) | ||
130 | { | ||
131 | return RSA_PKCS1_SSLeay(); | ||
132 | } | ||
133 | #endif | ||
134 | |||
123 | #ifdef USE_OPENSSL_ENGINE | 135 | #ifdef USE_OPENSSL_ENGINE |
124 | void | 136 | void |
125 | ssh_SSLeay_add_all_algorithms(void) | 137 | ssh_SSLeay_add_all_algorithms(void) |
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index c0ca20aaf..6d4f3f215 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.17 2010/12/04 12:20:50 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.18 2011/01/21 22:37:06 dtucker 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> |
@@ -78,6 +78,10 @@ extern const EVP_CIPHER *evp_acss(void); | |||
78 | # define EVP_CIPHER_CTX_key_length(c) ((c)->key_len) | 78 | # define EVP_CIPHER_CTX_key_length(c) ((c)->key_len) |
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | #ifndef HAVE_RSA_GET_DEFAULT_METHOD | ||
82 | RSA_METHOD *RSA_get_default_method(void); | ||
83 | #endif | ||
84 | |||
81 | /* | 85 | /* |
82 | * We overload some of the OpenSSL crypto functions with ssh_* equivalents | 86 | * We overload some of the OpenSSL crypto functions with ssh_* equivalents |
83 | * which cater for older and/or less featureful OpenSSL version. | 87 | * which cater for older and/or less featureful OpenSSL version. |