Update from HEAD
This commit is contained in:
parent
43f392c9a1
commit
05ee0523c1
@ -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
|
||||
|
@ -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 */
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user