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-05-05 08:46:30 +00:00
parent 4e50f02638
commit c44544a1d7
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
crypto/bio/bss_dgram.c
View File

@ -88,6 +88,8 @@ static int dgram_clear(BIO *bio);
static int BIO_dgram_should_retry(int s); static int BIO_dgram_should_retry(int s);
static void get_current_time(struct timeval *t);
static BIO_METHOD methods_dgramp= static BIO_METHOD methods_dgramp=
{ {
BIO_TYPE_DGRAM, BIO_TYPE_DGRAM,
@ -209,19 +211,7 @@ static int dgram_read(BIO *b, char *out, int outl)
if (data->hstimeout.tv_sec > 0 || data->hstimeout.tv_usec > 0) if (data->hstimeout.tv_sec > 0 || data->hstimeout.tv_usec > 0)
{ {
struct timeval curtime; struct timeval curtime;
#ifdef OPENSSL_SYS_WIN32 get_current_time(&curtime);
struct _timeb tb;
_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
if (curtime.tv_sec >= data->hstimeout.tv_sec && if (curtime.tv_sec >= data->hstimeout.tv_sec &&
curtime.tv_usec >= data->hstimeout.tv_usec) curtime.tv_usec >= data->hstimeout.tv_usec)
@ -383,14 +373,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_CTRL_DGRAM_SET_TIMEOUT: case BIO_CTRL_DGRAM_SET_TIMEOUT:
if (num > 0) if (num > 0)
{ {
#ifdef OPENSSL_SYS_WIN32 get_current_time(&data->hstimeout);
struct _timeb tb;
_ftime(&tb);
data->hstimeout.tv_sec = (long)tb.time;
data->hstimeout.tv_usec = (long)tb.millitm * 1000;
#else
gettimeofday(&(data->hstimeout), NULL);
#endif
data->hstimeout.tv_sec += data->hstimeoutdiff.tv_sec; data->hstimeout.tv_sec += data->hstimeoutdiff.tv_sec;
data->hstimeout.tv_usec += data->hstimeoutdiff.tv_usec; data->hstimeout.tv_usec += data->hstimeoutdiff.tv_usec;
if (data->hstimeout.tv_usec >= 1000000) if (data->hstimeout.tv_usec >= 1000000)
@ -606,3 +589,20 @@ int BIO_dgram_non_fatal_error(int err)
return(0); return(0);
} }
#endif #endif
static void get_current_time(struct timeval *t)
{
#ifdef OPENSSL_SYS_WIN32
struct _timeb tb;
_ftime(&tb);
t->tv_sec = (long)tb.time;
t->tv_usec = (long)tb.millitm * 1000;
#elif defined(OPENSSL_SYS_VMS)
struct timeb tb;
ftime(&tb);
t->tv_sec = (long)tb.time;
t->tv_usec = (long)tb.millitm * 1000;
#else
gettimeofday(t, NULL);
#endif
}

10
engines/ccgost/gost_lcl.h
View File

@ -89,15 +89,15 @@ typedef struct { /* FIXME incomplete */
-- Richard Levitte */ -- Richard Levitte */
#ifdef OPENSSL_SYS_VMS #ifdef OPENSSL_SYS_VMS
#undef GOST_CLIENT_KEY_EXCHANGE_PARAMS_it #undef GOST_CLIENT_KEY_EXCHANGE_PARAMS_it
#defined GOST_CLIENT_KEY_EXCHANGE_PARAMS_it GOST_CLIENT_KEY_EXC_PARAMS_it #define GOST_CLIENT_KEY_EXCHANGE_PARAMS_it GOST_CLIENT_KEY_EXC_PARAMS_it
#undef GOST_CLIENT_KEY_EXCHANGE_PARAMS_new #undef GOST_CLIENT_KEY_EXCHANGE_PARAMS_new
#defined GOST_CLIENT_KEY_EXCHANGE_PARAMS_new GOST_CLIENT_KEY_EXC_PARAMS_new #define GOST_CLIENT_KEY_EXCHANGE_PARAMS_new GOST_CLIENT_KEY_EXC_PARAMS_new
#undef GOST_CLIENT_KEY_EXCHANGE_PARAMS_free #undef GOST_CLIENT_KEY_EXCHANGE_PARAMS_free
#defined GOST_CLIENT_KEY_EXCHANGE_PARAMS_free GOST_CLIENT_KEY_EXC_PARAMS_free #define GOST_CLIENT_KEY_EXCHANGE_PARAMS_free GOST_CLIENT_KEY_EXC_PARAMS_free
#undef d2i_GOST_CLIENT_KEY_EXCHANGE_PARAMS #undef d2i_GOST_CLIENT_KEY_EXCHANGE_PARAMS
#defined d2i_GOST_CLIENT_KEY_EXCHANGE_PARAMS d2i_GOST_CLIENT_KEY_EXC_PARAMS #define d2i_GOST_CLIENT_KEY_EXCHANGE_PARAMS d2i_GOST_CLIENT_KEY_EXC_PARAMS
#undef i2d_GOST_CLIENT_KEY_EXCHANGE_PARAMS #undef i2d_GOST_CLIENT_KEY_EXCHANGE_PARAMS
#defined i2d_GOST_CLIENT_KEY_EXCHANGE_PARAMS i2d_GOST_CLIENT_KEY_EXC_PARAMS #define i2d_GOST_CLIENT_KEY_EXCHANGE_PARAMS i2d_GOST_CLIENT_KEY_EXC_PARAMS
#endif /* End of hack */ #endif /* End of hack */
DECLARE_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS) DECLARE_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
typedef struct { typedef struct {