diff options
author | Darren Tucker <dtucker@zip.com.au> | 2014-06-17 23:06:07 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2014-06-17 23:06:07 +1000 |
commit | 316fac6f18f87262a315c79bcf68b9f92c9337e4 (patch) | |
tree | 4ca56b926c75d844cf69b33461be32ae178e62e7 /openbsd-compat/openssl-compat.h | |
parent | af665bb7b092a59104db1e65577851cf35b86e32 (diff) |
- (dtucker) [entropy.c openbsd-compat/openssl-compat.{c,h}
openbsd-compat/regress/{.cvsignore,Makefile.in,opensslvertest.c}]
Move the OpenSSL header/library version test into its own function and add
tests for it. Fix it to allow fix version upgrades (but not downgrades).
Prompted by chl@ via OpenSMTPD (issue #462) and Debian (bug #748150).
ok djm@ chl@
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r-- | openbsd-compat/openssl-compat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 276b9706d..199dcc882 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.26 2014/02/13 05:38:33 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.27 2014/06/17 13:06:08 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> |
@@ -22,6 +22,8 @@ | |||
22 | #include <openssl/rsa.h> | 22 | #include <openssl/rsa.h> |
23 | #include <openssl/dsa.h> | 23 | #include <openssl/dsa.h> |
24 | 24 | ||
25 | int ssh_compatible_openssl(long, long); | ||
26 | |||
25 | /* Only in 0.9.8 */ | 27 | /* Only in 0.9.8 */ |
26 | #ifndef OPENSSL_DSA_MAX_MODULUS_BITS | 28 | #ifndef OPENSSL_DSA_MAX_MODULUS_BITS |
27 | # define OPENSSL_DSA_MAX_MODULUS_BITS 10000 | 29 | # define OPENSSL_DSA_MAX_MODULUS_BITS 10000 |