diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-03-05 08:25:20 +0100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-03-05 08:25:20 +0100 |
commit | fd30986c927e66985ddc43b25794651c76ba477c (patch) | |
tree | 16ef25a47e4eaa302bc4f54f930b802d3415ff41 /openbsd-compat/openssl-compat.h | |
parent | - (djm) [configure.ac] add a --without-openssl-header-check option to (diff) | |
download | openssh-fd30986c927e66985ddc43b25794651c76ba477c.tar.xz openssh-fd30986c927e66985ddc43b25794651c76ba477c.zip |
- (dtucker) [openbsd-compat/openssl-compat.h] Bug #1291: Work around a
bug in OpenSSL 0.9.8e that prevents aes256-ctr, aes192-ctr and arcfour256
ciphers from working correctly (disconnects with "Bad packet length"
errors) as found by Ben Harris. ok djm@
Diffstat (limited to '')
-rw-r--r-- | openbsd-compat/openssl-compat.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index c582cd269..9b5ccff5f 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.h,v 1.6 2006/02/22 11:24:47 dtucker Exp $ */ +/* $Id: openssl-compat.h,v 1.7 2007/03/05 07:25:20 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -46,6 +46,11 @@ extern const EVP_CIPHER *evp_acss(void); # endif #endif +/* OpenSSL 0.9.8e returns cipher key len not context key len */ +#if (OPENSSL_VERSION_NUMBER == 0x0090805fL) +# define EVP_CIPHER_CTX_key_length(c) ((c)->key_len) +#endif + /* * We overload some of the OpenSSL crypto functions with ssh_* equivalents * which cater for older and/or less featureful OpenSSL version. |