Updates from HEAD

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index dde0abe05a9324b98e3e0427c64a10ae19ca0ad9..9d2b78d3a285a10d4ad7135f390c0c6eac5ce306 100644 (file)
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -61,6 +61,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <sys/time.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
 

diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index 35e164121e50e59817d2a30945c6ab7659dffd9f..971d14f39a3d91621a9a2db251359bd7fa63b226 100644 (file)
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -379,6 +379,10 @@
 #undef cms_SignerIdentifier_get0_signer_id
 #define cms_SignerIdentifier_get0_signer_id    cms_SignerId_get0_signer_id
 
+/* Hack some long DTLS1 names */
+#undef dtls1_retransmit_buffered_messages
+#define dtls1_retransmit_buffered_messages     dtls1_retransmit_buffered_msgs
+
 #endif /* defined OPENSSL_SYS_VMS */