diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | mac.c | 2 | ||||
-rw-r--r-- | openbsd-compat/openssl-compat.h | 7 |
4 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20120117 | ||
2 | - (dtucker) [configure.ac mac.c openbsd-compat/openssl-compat.h] Add | ||
3 | null implementation of HMAC_CTX_init for the benefit of old versions | ||
4 | of OpenSSL that don't have it. | ||
5 | |||
1 | 20111219 | 6 | 20111219 |
2 | - OpenBSD CVS Sync | 7 | - OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2011/12/02 00:41:56 | 8 | - djm@cvs.openbsd.org 2011/12/02 00:41:56 |
diff --git a/configure.ac b/configure.ac index 5aeb7a8f7..54fc7d0cf 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.485 2011/11/21 05:38:50 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.486 2012/01/17 03:03:37 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.485 $) | 18 | AC_REVISION($Revision: 1.486 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -2205,7 +2205,7 @@ AC_LINK_IFELSE( | |||
2205 | ] | 2205 | ] |
2206 | ) | 2206 | ) |
2207 | 2207 | ||
2208 | AC_CHECK_FUNCS([RSA_generate_key_ex DSA_generate_parameters_ex BN_is_prime_ex RSA_get_default_method]) | 2208 | AC_CHECK_FUNCS([RSA_generate_key_ex DSA_generate_parameters_ex BN_is_prime_ex RSA_get_default_method HMAC_CTX_init]) |
2209 | 2209 | ||
2210 | AC_ARG_WITH([ssl-engine], | 2210 | AC_ARG_WITH([ssl-engine], |
2211 | [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ], | 2211 | [ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ], |
@@ -44,6 +44,8 @@ | |||
44 | 44 | ||
45 | #include "umac.h" | 45 | #include "umac.h" |
46 | 46 | ||
47 | #include "openbsd-compat/openssl-compat.h" | ||
48 | |||
47 | #define SSH_EVP 1 /* OpenSSL EVP-based MAC */ | 49 | #define SSH_EVP 1 /* OpenSSL EVP-based MAC */ |
48 | #define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */ | 50 | #define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */ |
49 | 51 | ||
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index c5fc24eb4..a151eff38 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.19 2011/05/10 01:13:38 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.20 2012/01/17 03:03:39 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> |
@@ -130,5 +130,10 @@ int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, | |||
130 | int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); | 130 | int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); |
131 | int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); | 131 | int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); |
132 | void ssh_OpenSSL_add_all_algorithms(void); | 132 | void ssh_OpenSSL_add_all_algorithms(void); |
133 | |||
134 | # ifndef HAVE_HMAC_CTX_INIT | ||
135 | # define HMAC_CTX_init(a) | ||
136 | # endif | ||
137 | |||
133 | #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ | 138 | #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ |
134 | 139 | ||