diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-11-22 17:59:00 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-11-22 17:59:00 +1100 |
commit | 9e0ff7afc894da2b5a9e5bfd334cf4a821acf0ae (patch) | |
tree | 0c45b96bc40c893b836a1320c594d8c455bcdeb8 | |
parent | 0a1847347dc789e88143a7ec8fe899c63f1bbde3 (diff) |
- (dtucker) Bug #1840: fix warning when configuring --with-ssl-engine, patch
from vapier at gentoo org.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/openssl-compat.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20101122 | ||
2 | - (dtucker) Bug #1840: fix warning when configuring --with-ssl-engine, patch | ||
3 | from vapier at gentoo org. | ||
4 | |||
1 | 20101120 | 5 | 20101120 |
2 | - OpenBSD CVS Sync | 6 | - OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2010/11/05 02:46:47 | 7 | - djm@cvs.openbsd.org 2010/11/05 02:46:47 |
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index 420496caa..c9bb7cb50 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.c,v 1.9 2010/01/28 23:54:11 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.c,v 1.10 2010/11/22 06:59: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> |
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #ifdef USE_OPENSSL_ENGINE | 21 | #ifdef USE_OPENSSL_ENGINE |
22 | # include <openssl/engine.h> | 22 | # include <openssl/engine.h> |
23 | # include <openssl/conf.h> | ||
23 | #endif | 24 | #endif |
24 | 25 | ||
25 | #define SSH_DONT_OVERLOAD_OPENSSL_FUNCS | 26 | #define SSH_DONT_OVERLOAD_OPENSSL_FUNCS |