From: Richard Levitte <levitte@openssl.org>
Date: Sun, 26 Apr 2009 11:35:58 +0000 (+0000)
Subject: Updates from HEAD
X-Git-Tag: OpenSSL_1_0_0-beta3~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5409414effb5b0cfcdc04ae1336fab38a6703fe5;p=thirdparty%2Fopenssl.git

Updates from HEAD
---

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index dde0abe05a9..9d2b78d3a28 100644
--- 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 35e164121e5..971d14f39a3 100644
--- 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 */