diff options
| author | Richard Levitte <levitte@openssl.org> | 2009-04-28 13:11:05 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2009-04-28 13:11:05 +0000 |
| commit | 05ee0523c1de4e74c49d5631fd4233f1f841af29 (patch) | |
| tree | 4b46f74a5859e9004f3ea9e8c40974ff97a59eaa /crypto | |
| parent | 43f392c9a18dafb666bdcd1224a8129cdc3a2f99 (diff) | |
Update from HEAD
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/bss_dgram.c | 7 | ||||
| -rw-r--r-- | crypto/symhacks.h | 4 |
2 files changed, 10 insertions, 1 deletions
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 */ |