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) [key.c defines.h openbsd-compat/openssl-compat.h] Move old OpenSSL 

compat glue into openssl-compat.h.
This commit is contained in:
Darren Tucker 2008-02-28 19:22:04 +11:00
parent bfaaf960a0
commit 3d295a6cf0
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -5,6 +5,8 @@
openbsd-compat/openssl-compat.{c,h}] Bug #1437 Move the OpenSSL compat openbsd-compat/openssl-compat.{c,h}] Bug #1437 Move the OpenSSL compat
header to after OpenSSL headers, since some versions of OpenSSL have header to after OpenSSL headers, since some versions of OpenSSL have
SSLeay_add_all_algorithms as a macro already. SSLeay_add_all_algorithms as a macro already.
- (dtucker) [key.c defines.h openbsd-compat/openssl-compat.h] Move old OpenSSL
compat glue into openssl-compat.h.
20080225 20080225
- (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack
@ -3635,4 +3637,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.4843 2008/02/28 08:13:52 dtucker Exp $ $Id: ChangeLog,v 1.4844 2008/02/28 08:22:04 dtucker Exp $

7
defines.h
View File

@ -25,7 +25,7 @@
#ifndef _DEFINES_H #ifndef _DEFINES_H
#define _DEFINES_H #define _DEFINES_H
/* $Id: defines.h,v 1.145 2007/09/26 21:03:20 dtucker Exp $ */ /* $Id: defines.h,v 1.146 2008/02/28 08:22:04 dtucker Exp $ */
/* Constants */ /* Constants */
@ -567,11 +567,6 @@ struct winsize {
# define CUSTOM_SSH_AUDIT_EVENTS # define CUSTOM_SSH_AUDIT_EVENTS
#endif #endif
/* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */
#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f)
# define OPENSSL_free(x) Free(x)
#endif
#if !defined(HAVE___func__) && defined(HAVE___FUNCTION__) #if !defined(HAVE___func__) && defined(HAVE___FUNCTION__)
# define __func__ __FUNCTION__ # define __func__ __FUNCTION__
#elif !defined(HAVE___func__) #elif !defined(HAVE___func__)

1
key.c
View File

@ -38,6 +38,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openbsd-compat/openssl-compat.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>

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

@ -1,4 +1,4 @@
/* $Id: openssl-compat.h,v 1.11 2008/02/28 08:13:52 dtucker Exp $ */ /* $Id: openssl-compat.h,v 1.12 2008/02/28 08:22:04 dtucker Exp $ */
/* /*
* Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@ -19,6 +19,11 @@
#include "includes.h" #include "includes.h"
#include <openssl/evp.h> #include <openssl/evp.h>
/* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */
#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f)
# define OPENSSL_free(x) Free(x)
#endif
#if OPENSSL_VERSION_NUMBER < 0x00906000L #if OPENSSL_VERSION_NUMBER < 0x00906000L
# define SSH_OLD_EVP # define SSH_OLD_EVP
# define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) # define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data)