mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
Avoid warnings on VC++ 2005.
This commit is contained in:
parent
ad2695b1b7
commit
7bbcb2f690
@ -144,7 +144,7 @@ IMPLEMENT_dtls1_meth_func(DTLSv1_client_method,
|
||||
int dtls1_connect(SSL *s)
|
||||
{
|
||||
BUF_MEM *buf=NULL;
|
||||
unsigned long Time=time(NULL),l;
|
||||
unsigned long Time=(unsigned long)time(NULL),l;
|
||||
long num1;
|
||||
void (*cb)(const SSL *ssl,int type,int val)=NULL;
|
||||
int ret= -1;
|
||||
@ -544,7 +544,7 @@ int dtls1_client_hello(SSL *s)
|
||||
/* else use the pre-loaded session */
|
||||
|
||||
p=s->s3->client_random;
|
||||
Time=time(NULL); /* Time */
|
||||
Time=(unsigned long)time(NULL); /* Time */
|
||||
l2n(Time,p);
|
||||
RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-sizeof(Time));
|
||||
|
||||
|
@ -145,7 +145,7 @@ IMPLEMENT_dtls1_meth_func(DTLSv1_server_method,
|
||||
int dtls1_accept(SSL *s)
|
||||
{
|
||||
BUF_MEM *buf;
|
||||
unsigned long l,Time=time(NULL);
|
||||
unsigned long l,Time=(unsigned long)time(NULL);
|
||||
void (*cb)(const SSL *ssl,int type,int val)=NULL;
|
||||
long num1;
|
||||
int ret= -1;
|
||||
@ -667,7 +667,7 @@ int dtls1_send_server_hello(SSL *s)
|
||||
{
|
||||
buf=(unsigned char *)s->init_buf->data;
|
||||
p=s->s3->server_random;
|
||||
Time=time(NULL); /* Time */
|
||||
Time=(unsigned long)time(NULL); /* Time */
|
||||
l2n(Time,p);
|
||||
RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-sizeof(Time));
|
||||
/* Do the message type and length last */
|
||||
|
@ -88,7 +88,7 @@ IMPLEMENT_ssl23_meth_func(SSLv23_client_method,
|
||||
int ssl23_connect(SSL *s)
|
||||
{
|
||||
BUF_MEM *buf=NULL;
|
||||
unsigned long Time=time(NULL);
|
||||
unsigned long Time=(unsigned long)time(NULL);
|
||||
void (*cb)(const SSL *ssl,int type,int val)=NULL;
|
||||
int ret= -1;
|
||||
int new_state,state;
|
||||
@ -236,7 +236,7 @@ static int ssl23_client_hello(SSL *s)
|
||||
#endif
|
||||
|
||||
p=s->s3->client_random;
|
||||
Time=time(NULL); /* Time */
|
||||
Time=(unsigned long)time(NULL); /* Time */
|
||||
l2n(Time,p);
|
||||
if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
|
||||
return -1;
|
||||
|
@ -140,7 +140,7 @@ IMPLEMENT_ssl23_meth_func(SSLv23_server_method,
|
||||
int ssl23_accept(SSL *s)
|
||||
{
|
||||
BUF_MEM *buf;
|
||||
unsigned long Time=time(NULL);
|
||||
unsigned long Time=(unsigned long)time(NULL);
|
||||
void (*cb)(const SSL *ssl,int type,int val)=NULL;
|
||||
int ret= -1;
|
||||
int new_state,state;
|
||||
|
@ -144,7 +144,7 @@ IMPLEMENT_ssl2_meth_func(SSLv2_client_method,
|
||||
|
||||
int ssl2_connect(SSL *s)
|
||||
{
|
||||
unsigned long l=time(NULL);
|
||||
unsigned long l=(unsigned long)time(NULL);
|
||||
BUF_MEM *buf=NULL;
|
||||
int ret= -1;
|
||||
void (*cb)(const SSL *ssl,int type,int val)=NULL;
|
||||
|
@ -144,7 +144,7 @@ IMPLEMENT_ssl2_meth_func(SSLv2_server_method,
|
||||
|
||||
int ssl2_accept(SSL *s)
|
||||
{
|
||||
unsigned long l=time(NULL);
|
||||
unsigned long l=(unsigned long)time(NULL);
|
||||
BUF_MEM *buf=NULL;
|
||||
int ret= -1;
|
||||
long num1;
|
||||
|
@ -159,7 +159,7 @@ IMPLEMENT_ssl3_meth_func(SSLv3_client_method,
|
||||
int ssl3_connect(SSL *s)
|
||||
{
|
||||
BUF_MEM *buf=NULL;
|
||||
unsigned long Time=time(NULL),l;
|
||||
unsigned long Time=(unsigned long)time(NULL),l;
|
||||
long num1;
|
||||
void (*cb)(const SSL *ssl,int type,int val)=NULL;
|
||||
int ret= -1;
|
||||
@ -541,7 +541,7 @@ int ssl3_client_hello(SSL *s)
|
||||
/* else use the pre-loaded session */
|
||||
|
||||
p=s->s3->client_random;
|
||||
Time=time(NULL); /* Time */
|
||||
Time=(unsigned long)time(NULL); /* Time */
|
||||
l2n(Time,p);
|
||||
if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
|
||||
goto err;
|
||||
|
@ -164,7 +164,7 @@ IMPLEMENT_ssl3_meth_func(SSLv3_server_method,
|
||||
int ssl3_accept(SSL *s)
|
||||
{
|
||||
BUF_MEM *buf;
|
||||
unsigned long l,Time=time(NULL);
|
||||
unsigned long l,Time=(unsigned long)time(NULL);
|
||||
void (*cb)(const SSL *ssl,int type,int val)=NULL;
|
||||
long num1;
|
||||
int ret= -1;
|
||||
@ -1038,7 +1038,7 @@ int ssl3_send_server_hello(SSL *s)
|
||||
{
|
||||
buf=(unsigned char *)s->init_buf->data;
|
||||
p=s->s3->server_random;
|
||||
Time=time(NULL); /* Time */
|
||||
Time=(unsigned long)time(NULL); /* Time */
|
||||
l2n(Time,p);
|
||||
if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
|
||||
return -1;
|
||||
|
@ -344,7 +344,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
|
||||
OPENSSL_free(ai.data); ai.data=NULL; ai.length=0;
|
||||
}
|
||||
else
|
||||
ret->time=time(NULL);
|
||||
ret->time=(unsigned long)time(NULL);
|
||||
|
||||
ai.length=0;
|
||||
M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,2);
|
||||
|
@ -1914,7 +1914,7 @@ void ssl_update_cache(SSL *s,int mode)
|
||||
?s->ctx->stats.sess_connect_good
|
||||
:s->ctx->stats.sess_accept_good) & 0xff) == 0xff)
|
||||
{
|
||||
SSL_CTX_flush_sessions(s->ctx,time(NULL));
|
||||
SSL_CTX_flush_sessions(s->ctx,(unsigned long)time(NULL));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -118,7 +118,7 @@ SSL_SESSION *SSL_SESSION_new(void)
|
||||
ss->verify_result = 1; /* avoid 0 (= X509_V_OK) just in case */
|
||||
ss->references=1;
|
||||
ss->timeout=60*5+4; /* 5 minute timeout by default */
|
||||
ss->time=time(NULL);
|
||||
ss->time=(unsigned long)time(NULL);
|
||||
ss->prev=NULL;
|
||||
ss->next=NULL;
|
||||
ss->compress_meth=0;
|
||||
|
Loading…
Reference in New Issue
Block a user