summaryrefslogtreecommitdiffstats
path: root/openbsd-compat/openssl-compat.h
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2008-07-23 09:15:38 +0000
committerdes <des@FreeBSD.org>2008-07-23 09:15:38 +0000
commit367fd865463ff70d9176231cb7590e6e69b51b06 (patch)
tree31274ced9514914f9504202c6e49c93d509e710d /openbsd-compat/openssl-compat.h
parente3cfeae816c1b89dbdb19357e2256b4b252fbf05 (diff)
downloadFreeBSD-src-367fd865463ff70d9176231cb7590e6e69b51b06.zip
FreeBSD-src-367fd865463ff70d9176231cb7590e6e69b51b06.tar.gz
Vendor import of OpenSSH 4.6p1 for posterity's sake
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r--openbsd-compat/openssl-compat.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index c582cd2..9b5ccff 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.
OpenPOWER on IntegriCloud