summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-02-02 18:44:19 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-02-02 18:44:19 +1100
commitcc7c212830e3f5adabe1996e6b498f01e963cfee (patch)
treef910b97042a2cb8b7ff779a28142c3bafbe4b6e1
parentbfd52192f3f6b2c836136019e07dbcbb56cc63a0 (diff)
- (dtucker) [configure.ac] Bug #1148: Fix "crippled AES" test so that it
works with picky compilers. Patch from alex.kiernan at thus.net.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cc7daba5e..8943f0e96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120060202
2 - (dtucker) [configure.ac] Bug #1148: Fix "crippled AES" test so that it
3 works with picky compilers. Patch from alex.kiernan at thus.net.
4
120060201 520060201
2 - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to 6 - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to
3 determine the user's login name - needed for regress tests on Solaris 7 determine the user's login name - needed for regress tests on Solaris
@@ -3818,4 +3822,4 @@
3818 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3822 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3819 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3823 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3820 3824
3821$Id: ChangeLog,v 1.4118 2006/02/01 11:32:17 djm Exp $ 3825$Id: ChangeLog,v 1.4119 2006/02/02 07:44:19 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 70e26deea..6b5ec8636 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.322 2006/01/29 13:22:39 dtucker Exp $ 1# $Id: configure.ac,v 1.323 2006/02/02 07:44:19 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -1832,7 +1832,7 @@ AC_COMPILE_IFELSE(
1832 [AC_LANG_SOURCE([[ 1832 [AC_LANG_SOURCE([[
1833#include <string.h> 1833#include <string.h>
1834#include <openssl/evp.h> 1834#include <openssl/evp.h>
1835int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL)} 1835int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL);}
1836 ]])], 1836 ]])],
1837 [ 1837 [
1838 AC_MSG_RESULT(no) 1838 AC_MSG_RESULT(no)