generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from HEAD

Browse Source
This commit is contained in:
Richard Levitte 2009-04-28 13:11:05 +00:00
parent 43f392c9a1
commit 05ee0523c1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/bio/bss_dgram.c
View File

@ -66,7 +66,7 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#ifdef OPENSSL_SYS_WIN32 #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)
#include <sys/timeb.h> #include <sys/timeb.h>
#endif #endif
@ -214,6 +214,11 @@ static int dgram_read(BIO *b, char *out, int outl)
_ftime(&tb); _ftime(&tb);
curtime.tv_sec = (long)tb.time; curtime.tv_sec = (long)tb.time;
curtime.tv_usec = (long)tb.millitm * 1000; 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 #else
gettimeofday(&curtime, NULL); gettimeofday(&curtime, NULL);
#endif #endif

4
crypto/symhacks.h
View File

@ -365,6 +365,10 @@
#undef cms_SignerIdentifier_get0_signer_id #undef cms_SignerIdentifier_get0_signer_id
#define cms_SignerIdentifier_get0_signer_id cms_SignerId_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 */ #endif /* defined OPENSSL_SYS_VMS */