diff options
author | Damien Miller <djm@mindrot.org> | 2014-08-22 17:36:19 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-08-22 17:36:19 +1000 |
commit | 6d62784b8973340b251fea6b04890f471adf28db (patch) | |
tree | 77b0ebdf3fb634bb079a636e2b7f3b531e79745f /configure.ac | |
parent | 4f1ff1ed782117f5d5204d4e91156ed5da07cbb7 (diff) |
- (djm) [configure.ac] include leading zero characters in OpenSSL version
number; fixes test for unsupported versions
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 11e8e12e0..479d4c71d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.579 2014/08/20 01:05:03 djm Exp $ | 1 | # $Id: configure.ac,v 1.580 2014/08/22 07:36:20 djm 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 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.579 $) | 18 | AC_REVISION($Revision: 1.580 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -2243,7 +2243,7 @@ AC_RUN_IFELSE( | |||
2243 | if(fd == NULL) | 2243 | if(fd == NULL) |
2244 | exit(1); | 2244 | exit(1); |
2245 | 2245 | ||
2246 | if ((rc = fprintf(fd ,"%x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0) | 2246 | if ((rc = fprintf(fd ,"%08x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0) |
2247 | exit(1); | 2247 | exit(1); |
2248 | 2248 | ||
2249 | exit(0); | 2249 | exit(0); |
@@ -2278,7 +2278,7 @@ AC_RUN_IFELSE( | |||
2278 | if(fd == NULL) | 2278 | if(fd == NULL) |
2279 | exit(1); | 2279 | exit(1); |
2280 | 2280 | ||
2281 | if ((rc = fprintf(fd ,"%x (%s)\n", SSLeay(), | 2281 | if ((rc = fprintf(fd ,"%08x (%s)\n", SSLeay(), |
2282 | SSLeay_version(SSLEAY_VERSION))) <0) | 2282 | SSLeay_version(SSLEAY_VERSION))) <0) |
2283 | exit(1); | 2283 | exit(1); |
2284 | 2284 | ||