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) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle 

headers so ./configure --with-ssl-engine actually works.  Patch from
   Ian Lister.
This commit is contained in:
Darren Tucker 2008-02-25 21:13:47 +11:00
parent acada07b52
commit 935e20a3f0
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -5,6 +5,9 @@
- (dtucker) [configure.ac audit-bsm.c] Bug #1420: Add a local implementation - (dtucker) [configure.ac audit-bsm.c] Bug #1420: Add a local implementation
of aug_get_machine for systems that don't have their own (eg OS X, FreeBSD). of aug_get_machine for systems that don't have their own (eg OS X, FreeBSD).
Help and testing from csjp at FreeBSD org, vgiffin at apple com. ok djm@ Help and testing from csjp at FreeBSD org, vgiffin at apple com. ok djm@
- (dtucker) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle
headers so ./configure --with-ssl-engine actually works. Patch from
Ian Lister.
20080224 20080224
- (tim) [contrib/cygwin/ssh-host-config] - (tim) [contrib/cygwin/ssh-host-config]
@ -3624,4 +3627,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4840 2008/02/25 10:05:04 dtucker Exp $ $Id: ChangeLog,v 1.4841 2008/02/25 10:13:47 dtucker Exp $

1
includes.h
View File

@ -166,6 +166,7 @@
#include "platform.h" #include "platform.h"
#include "openbsd-compat/openbsd-compat.h" #include "openbsd-compat/openbsd-compat.h"
#include "openbsd-compat/bsd-nextstep.h" #include "openbsd-compat/bsd-nextstep.h"
#include "openbsd-compat/openssl-compat.h"
#include "entropy.h" #include "entropy.h"

6
openbsd-compat/openssl-compat.c
View File

@ -1,4 +1,4 @@
/* $Id: openssl-compat.c,v 1.4 2006/02/22 11:24:47 dtucker Exp $ */ /* $Id: openssl-compat.c,v 1.5 2008/02/25 10:13:47 dtucker Exp $ */
/* /*
* Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@ -16,15 +16,13 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
#include "includes.h" #include "includes.h"
#ifdef USE_OPENSSL_ENGINE #ifdef USE_OPENSSL_ENGINE
# include <openssl/engine.h> # include <openssl/engine.h>
#endif #endif
#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
#include "openssl-compat.h"
#ifdef SSH_OLD_EVP #ifdef SSH_OLD_EVP
int int
ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type, ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type,