The branch master has been updated
via 703f44e73c18a63a65499fedc57893ae0f413eac (commit)
via 686c86a4301309fa6eb22283cc8fd78adc7d8eea (commit)
from 0c767ddcbbbddf79ae61a4b307df0115ced0c110 (commit)
- Log -----------------------------------------------------------------
commit 703f44e73c18a63a65499fedc57893ae0f413eac
Author: Ben Laurie <[email protected]>
Date: Sun Mar 27 12:28:56 2016 +0100
Make it legal C.
Reviewed-by: Rich Salz <[email protected]>
commit 686c86a4301309fa6eb22283cc8fd78adc7d8eea
Author: Ben Laurie <[email protected]>
Date: Sun Mar 27 12:28:23 2016 +0100
More things that don't work together.
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configure | 2 ++
include/openssl/lhash.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Configure b/Configure
index b4afea9..34db142 100755
--- a/Configure
+++ b/Configure
@@ -359,6 +359,7 @@ my @disable_cascades = (
"ec" => [ "ecdsa", "ecdh" ],
"dgram" => [ "dtls", "sctp" ],
+ "sock" => [ "sctp" ],
"dtls" => [ @dtls ],
# SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA
@@ -394,6 +395,7 @@ my @disable_cascades = (
"shared" => [ "dynamic-engine" ],
"engine" => [ "afalgeng" ],
"comp" => [ "zlib" ],
+ sub { !$disabled{"unit-test"} } => [ "heartbeats" ],
);
# Avoid protocol support holes. Also disable all versions below N, if version
diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h
index e10c522..8b8822b 100644
--- a/include/openssl/lhash.h
+++ b/include/openssl/lhash.h
@@ -180,7 +180,7 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
# define LHASH_OF(type) struct lhash_st_##type
# define DEFINE_LHASH_OF(type) \
- LHASH_OF(type) { union { void* d1; unsigned long d2; int d3; }; }; \
+ LHASH_OF(type) { union lh_##type##_dummy { void* d1; unsigned long d2; int
d3; } dummy; }; \
static ossl_inline LHASH_OF(type) * \
lh_##type##_new(unsigned long (*hfn)(const type *), \
int (*cfn)(const type *, const type *)) \
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
