From: Richard Levitte <levitte@openssl.org>
Date: Tue, 28 Apr 2009 13:11:05 +0000 (+0000)
Subject: Update from HEAD
X-Git-Tag: OpenSSL_0_9_8m-beta1~233
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=05ee0523c1de4e74c49d5631fd4233f1f841af29;p=oweals%2Fopenssl.git

Update from HEAD
---

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index dde0abe05a..256868265c 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -66,7 +66,7 @@
 
 #include <openssl/bio.h>
 
-#ifdef OPENSSL_SYS_WIN32
+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)
 #include <sys/timeb.h>
 #endif
 
@@ -214,6 +214,11 @@ static int dgram_read(BIO *b, char *out, int outl)
 				_ftime(&tb);
 				curtime.tv_sec = (long)tb.time;
 				curtime.tv_usec = (long)tb.millitm * 1000;
+#elif defined(OPENSSL_SYS_VMS)
+				struct timeb tb;
+				ftime(&tb);
+				curtime.tv_sec = (long)tb.time;
+				curtime.tv_usec = (long)tb.millitm * 1000;
 #else
 				gettimeofday(&curtime, NULL);
 #endif
diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index 8728e6124d..673eba785a 100644
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -365,6 +365,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 */