tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac mac.c openbsd-compat/openssl-compat.h] Add 

null implementation of HMAC_CTX_init for the benefit of old versions
   of OpenSSL that don't have it.
This commit is contained in:
Darren Tucker 2012-01-17 14:03:34 +11:00
parent 8ed4de8f1d
commit e9b3ad73ba
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
20120117
- (dtucker) [configure.ac mac.c openbsd-compat/openssl-compat.h] Add
null implementation of HMAC_CTX_init for the benefit of old versions
of OpenSSL that don't have it.
20111219
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2011/12/02 00:41:56

6
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.485 2011/11/21 05:38:50 dtucker Exp $
# $Id: configure.ac,v 1.486 2012/01/17 03:03:37 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.485 $)
AC_REVISION($Revision: 1.486 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
@ -2205,7 +2205,7 @@ AC_LINK_IFELSE(
]
)
AC_CHECK_FUNCS([RSA_generate_key_ex DSA_generate_parameters_ex BN_is_prime_ex RSA_get_default_method])
AC_CHECK_FUNCS([RSA_generate_key_ex DSA_generate_parameters_ex BN_is_prime_ex RSA_get_default_method HMAC_CTX_init])
AC_ARG_WITH([ssl-engine],
[ --with-ssl-engine Enable OpenSSL (hardware) ENGINE support ],

2
mac.c
View File

@ -44,6 +44,8 @@
#include "umac.h"
#include "openbsd-compat/openssl-compat.h"
#define SSH_EVP 1 /* OpenSSL EVP-based MAC */
#define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */

7
openbsd-compat/openssl-compat.h
View File

@ -1,4 +1,4 @@
/* $Id: openssl-compat.h,v 1.19 2011/05/10 01:13:38 dtucker Exp $ */
/* $Id: openssl-compat.h,v 1.20 2012/01/17 03:03:39 dtucker Exp $ */
/*
* 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 *,
int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int);
int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *);
void ssh_OpenSSL_add_all_algorithms(void);
# ifndef HAVE_HMAC_CTX_INIT
# define HMAC_CTX_init(a)
# endif
#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */