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

Backport of other fixes to keep VC++ happy.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2006-01-30 13:49:59 +00:00
parent 1ce2fb42de
commit d37ca24da9
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/s23_clnt.c
View File

@@ -106,7 +106,7 @@ SSL_METHOD *SSLv23_client_method(void)
int ssl23_connect(SSL *s) int ssl23_connect(SSL *s)
{ {
BUF_MEM *buf=NULL; 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; void (*cb)(const SSL *ssl,int type,int val)=NULL;
int ret= -1; int ret= -1;
int new_state,state; int new_state,state;
@@ -254,7 +254,7 @@ static int ssl23_client_hello(SSL *s)
#endif #endif
p=s->s3->client_random; p=s->s3->client_random;
Time=time(NULL); /* Time */ Time=(unsigned long)time(NULL); /* Time */
l2n(Time,p); l2n(Time,p);
if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0) if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
return -1; return -1;

2
ssl/s23_srvr.c
View File

@@ -158,7 +158,7 @@ SSL_METHOD *SSLv23_server_method(void)
int ssl23_accept(SSL *s) int ssl23_accept(SSL *s)
{ {
BUF_MEM *buf; 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; void (*cb)(const SSL *ssl,int type,int val)=NULL;
int ret= -1; int ret= -1;
int new_state,state; int new_state,state;

2
ssl/s2_clnt.c
View File

@@ -162,7 +162,7 @@ SSL_METHOD *SSLv2_client_method(void)
int ssl2_connect(SSL *s) int ssl2_connect(SSL *s)
{ {
unsigned long l=time(NULL); unsigned long l=(unsigned long)time(NULL);
BUF_MEM *buf=NULL; BUF_MEM *buf=NULL;
int ret= -1; int ret= -1;
void (*cb)(const SSL *ssl,int type,int val)=NULL; void (*cb)(const SSL *ssl,int type,int val)=NULL;

2
ssl/s2_srvr.c
View File

@@ -162,7 +162,7 @@ SSL_METHOD *SSLv2_server_method(void)
int ssl2_accept(SSL *s) int ssl2_accept(SSL *s)
{ {
unsigned long l=time(NULL); unsigned long l=(unsigned long)time(NULL);
BUF_MEM *buf=NULL; BUF_MEM *buf=NULL;
int ret= -1; int ret= -1;
long num1; long num1;

4
ssl/s3_clnt.c
View File

@@ -165,7 +165,7 @@ SSL_METHOD *SSLv3_client_method(void)
int ssl3_connect(SSL *s) int ssl3_connect(SSL *s)
{ {
BUF_MEM *buf=NULL; BUF_MEM *buf=NULL;
unsigned long Time=time(NULL),l; unsigned long Time=(unsigned long)time(NULL),l;
long num1; long num1;
void (*cb)(const SSL *ssl,int type,int val)=NULL; void (*cb)(const SSL *ssl,int type,int val)=NULL;
int ret= -1; int ret= -1;
@@ -533,7 +533,7 @@ static int ssl3_client_hello(SSL *s)
/* else use the pre-loaded session */ /* else use the pre-loaded session */
p=s->s3->client_random; p=s->s3->client_random;
Time=time(NULL); /* Time */ Time=(unsigned long)time(NULL); /* Time */
l2n(Time,p); l2n(Time,p);
if(RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0) if(RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
goto err; goto err;

4
ssl/s3_srvr.c
View File

@@ -173,7 +173,7 @@ SSL_METHOD *SSLv3_server_method(void)
int ssl3_accept(SSL *s) int ssl3_accept(SSL *s)
{ {
BUF_MEM *buf; 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; void (*cb)(const SSL *ssl,int type,int val)=NULL;
long num1; long num1;
int ret= -1; int ret= -1;
@@ -954,7 +954,7 @@ static int ssl3_send_server_hello(SSL *s)
{ {
buf=(unsigned char *)s->init_buf->data; buf=(unsigned char *)s->init_buf->data;
p=s->s3->server_random; p=s->s3->server_random;
Time=time(NULL); /* Time */ Time=(unsigned long)time(NULL); /* Time */
l2n(Time,p); l2n(Time,p);
if(RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0) if(RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
return -1; return -1;

2
ssl/ssl_asn1.c
View File

@@ -344,7 +344,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char * const *pp,
OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; OPENSSL_free(ai.data); ai.data=NULL; ai.length=0;
} }
else else
ret->time=time(NULL); ret->time=(unsigned long)time(NULL);
ai.length=0; ai.length=0;
M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,2); M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,2);

2
ssl/ssl_lib.c
View File

@@ -1716,7 +1716,7 @@ void ssl_update_cache(SSL *s,int mode)
?s->ctx->stats.sess_connect_good ?s->ctx->stats.sess_connect_good
:s->ctx->stats.sess_accept_good) & 0xff) == 0xff) :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));
} }
} }
} }

2
ssl/ssl_sess.c
View File

@@ -118,7 +118,7 @@ SSL_SESSION *SSL_SESSION_new(void)
ss->verify_result = 1; /* avoid 0 (= X509_V_OK) just in case */ ss->verify_result = 1; /* avoid 0 (= X509_V_OK) just in case */
ss->references=1; ss->references=1;
ss->timeout=60*5+4; /* 5 minute timeout by default */ ss->timeout=60*5+4; /* 5 minute timeout by default */
ss->time=time(NULL); ss->time=(unsigned long)time(NULL);
ss->prev=NULL; ss->prev=NULL;
ss->next=NULL; ss->next=NULL;
ss->compress_meth=0; ss->compress_meth=0;