summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--openbsd-compat/openssl-compat.h9
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ec09babc..ed5c33226 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
120140825 120140830
2 - (djm) [openbsd-compat/openssl-compat.h] add
3 OPENSSL_[RD]SA_MAX_MODULUS_BITS defines for OpenSSL that lacks them
4
520140827
2 - (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c] 6 - (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]
3 [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] 7 [regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c]
4 [regress/unittests/sshkey/common.c] 8 [regress/unittests/sshkey/common.c]
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 21002107a..d0c3307d0 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.h,v 1.29 2014/07/20 16:24:59 dtucker Exp $ */ 1/* $Id: openssl-compat.h,v 1.30 2014/08/29 16:30:30 djm 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>
@@ -34,6 +34,13 @@ int ssh_compatible_openssl(long, long);
34# define LIBCRYPTO_EVP_INL_TYPE size_t 34# define LIBCRYPTO_EVP_INL_TYPE size_t
35#endif 35#endif
36 36
37#ifndef OPENSSL_RSA_MAX_MODULUS_BITS
38# define OPENSSL_RSA_MAX_MODULUS_BITS 16384
39#endif
40#ifndef OPENSSL_DSA_MAX_MODULUS_BITS
41# define OPENSSL_DSA_MAX_MODULUS_BITS 10000
42#endif
43
37#ifndef OPENSSL_HAVE_EVPCTR 44#ifndef OPENSSL_HAVE_EVPCTR
38#define EVP_aes_128_ctr evp_aes_128_ctr 45#define EVP_aes_128_ctr evp_aes_128_ctr
39#define EVP_aes_192_ctr evp_aes_128_ctr 46#define EVP_aes_192_ctr evp_aes_128_ctr