diff options
author | Darren Tucker <dtucker@zip.com.au> | 2008-02-28 19:22:04 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2008-02-28 19:22:04 +1100 |
commit | 3d295a6cf0c4e240509f035d514393eec4abd43d (patch) | |
tree | b97516d9ff135f97ad261f1396b350ccef51609b /openbsd-compat | |
parent | bfaaf960a0204d5ee8ed75af05104737a54b4a52 (diff) | |
download | openssh-git-3d295a6cf0c4e240509f035d514393eec4abd43d.tar.gz |
- (dtucker) [key.c defines.h openbsd-compat/openssl-compat.h] Move old OpenSSL
compat glue into openssl-compat.h.
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/openssl-compat.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index f53695aa..6a1bed5b 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -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> @@ -19,6 +19,11 @@ #include "includes.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 # define SSH_OLD_EVP # define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) |