tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [openbsd-compat/openssl-compat.h] Remove redundant definition

Browse Source 
of USE_BUILTIN_RIJNDAEL since the <0.9.6 test is covered by the
   subsequent <0.9.7 test.
This commit is contained in:
Darren Tucker 2007-06-14 23:47:31 +10:00
parent a2ed75582f
commit 7dae3d296e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -5,6 +5,9 @@
umac support. With tim@ djm@, ok djm. umac support. With tim@ djm@, ok djm.
- (dtucker) [openbsd-compat/openssl-compat.h] Merge USE_BUILTIN_RIJNDAEL - (dtucker) [openbsd-compat/openssl-compat.h] Merge USE_BUILTIN_RIJNDAEL
sections. Fixes builds with early OpenSSL 0.9.6 versions. sections. Fixes builds with early OpenSSL 0.9.6 versions.
- (dtucker) [openbsd-compat/openssl-compat.h] Remove redundant definition
of USE_BUILTIN_RIJNDAEL since the <0.9.6 test is covered by the
subsequent <0.9.7 test.
20070612 20070612
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
@ -3069,4 +3072,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.4701 2007/06/14 13:38:39 dtucker Exp $ $Id: ChangeLog,v 1.4702 2007/06/14 13:47:31 dtucker Exp $

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

@ -1,4 +1,4 @@
/* $Id: openssl-compat.h,v 1.9 2007/06/14 13:38:39 dtucker Exp $ */ /* $Id: openssl-compat.h,v 1.10 2007/06/14 13:47:31 dtucker Exp $ */
/* /*
* Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@ -22,7 +22,6 @@
#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)
# define USE_BUILTIN_RIJNDAEL
#endif #endif
#if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES) #if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES)