Update from HEAD

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index dde0abe05a9324b98e3e0427c64a10ae19ca0ad9..256868265cd8d4c80ac2d09c6afec8a3c2458b83 100644 (file)
--- 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 8728e6124da7b7a09d50ef255f519fb7a6dc33d3..673eba785a1fc1f20ff416fe88c22c81204ee6cb 100644 (file)
--- 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 */