summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--openbsd-compat/openssl-compat.h9
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b3eb526f6..68c99482b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120051120
2 - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what
3 is going on.
4
120051112 520051112
2 - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific 6 - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific
3 ifdef lost during sync. Spotted by tim@. 7 ifdef lost during sync. Spotted by tim@.
@@ -3302,4 +3306,4 @@
3302 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3306 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3303 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3307 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3304 3308
3305$Id: ChangeLog,v 1.3995 2005/11/12 10:30:07 dtucker Exp $ 3309$Id: ChangeLog,v 1.3996 2005/11/20 03:09:59 dtucker Exp $
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index d9b2fa55f..4988485f1 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.h,v 1.1 2005/06/09 11:45:11 dtucker Exp $ */ 1/* $Id: openssl-compat.h,v 1.2 2005/11/20 03:10:00 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> 4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -43,7 +43,12 @@ extern const EVP_CIPHER *evp_acss(void);
43#endif 43#endif
44 44
45/* 45/*
46 * insert comment here 46 * We overload some of the OpenSSL crypto functions with ssh_* equivalents
47 * which cater for older and/or less featureful OpenSSL version.
48 *
49 * In order for the compat library to call the real functions, it must
50 * define SSH_DONT_OVERLOAD_OPENSSL_FUNCS before including this file and
51 * implement the ssh_* equivalents.
47 */ 52 */
48#ifdef SSH_OLD_EVP 53#ifdef SSH_OLD_EVP
49 54