diff options
| author | Damien Miller <djm@mindrot.org> | 2014-08-20 11:05:03 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-08-20 11:05:03 +1000 |
| commit | 2195847e503a382f83ee969b0a8bd3dfe0e55c18 (patch) | |
| tree | 910a4269a0f34a711a3c89376616b6cb8c6f2677 | |
| parent | a75aca1bbc989aa9f8b1b08489d37855f3d24d1a (diff) | |
| download | openssh-git-2195847e503a382f83ee969b0a8bd3dfe0e55c18.tar.gz | |
- (djm) [configure.ac] Check OpenSSL version is supported at configure time;
suggested by Kevin Brott
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2014020 + - (djm) [configure.ac] Check OpenSSL version is supported at configure time; + suggested by Kevin Brott + 20140819 - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen - (djm) [sshbuf.h] Fix compilation on systems without OPENSSL_HAS_ECC. diff --git a/configure.ac b/configure.ac index 866acc8a..11e8e12e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.578 2014/07/15 00:41:39 djm Exp $ +# $Id: configure.ac,v 1.579 2014/08/20 01:05:03 djm Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) -AC_REVISION($Revision: 1.578 $) +AC_REVISION($Revision: 1.579 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -2278,13 +2278,21 @@ AC_RUN_IFELSE( if(fd == NULL) exit(1); - if ((rc = fprintf(fd ,"%x (%s)\n", SSLeay(), SSLeay_version(SSLEAY_VERSION))) <0) + if ((rc = fprintf(fd ,"%x (%s)\n", SSLeay(), + SSLeay_version(SSLEAY_VERSION))) <0) exit(1); exit(0); ]])], [ ssl_library_ver=`cat conftest.ssllibver` + # Check version is supported. + case "$ssl_library_ver" in + 0090[0-7]*|009080[0-5]*) + AC_MSG_ERROR([OpenSSL >= 0.9.8f required]) + ;; + *) ;; + esac AC_MSG_RESULT([$ssl_library_ver]) ], [ |