summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 128057cbf..d3077fbda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120060804
2 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
3 versions of Solaris, so use AC_LINK_IFELSE to actually link the test program
4 rather than just compiling it. Spotted by dlg@.
5
120060802 620060802
2 - (dtucker) [openbsd-compat/daemon.c] Add unistd.h for fork() prototype. 7 - (dtucker) [openbsd-compat/daemon.c] Add unistd.h for fork() prototype.
3 8
@@ -5062,4 +5067,4 @@
5062 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5067 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5063 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5068 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5064 5069
5065$Id: ChangeLog,v 1.4440 2006/08/02 13:33:54 dtucker Exp $ 5070$Id: ChangeLog,v 1.4441 2006/08/04 09:44:23 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 3373dadc7..31dac052e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.347 2006/07/12 09:02:57 dtucker Exp $ 1# $Id: configure.ac,v 1.348 2006/08/04 09:44:23 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.347 $) 18AC_REVISION($Revision: 1.348 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -1892,7 +1892,7 @@ int main(void){ENGINE_load_builtin_engines();ENGINE_register_all_complete();}
1892 1892
1893# Check for OpenSSL without EVP_aes_{192,256}_cbc 1893# Check for OpenSSL without EVP_aes_{192,256}_cbc
1894AC_MSG_CHECKING([whether OpenSSL has crippled AES support]) 1894AC_MSG_CHECKING([whether OpenSSL has crippled AES support])
1895AC_COMPILE_IFELSE( 1895AC_LINK_IFELSE(
1896 [AC_LANG_SOURCE([[ 1896 [AC_LANG_SOURCE([[
1897#include <string.h> 1897#include <string.h>
1898#include <openssl/evp.h> 1898#include <openssl/evp.h>