From 974d52fdb8ed952ccadd764f56be1449d1930e2c Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 5 Dec 2005 17:32:22 +0000 Subject: [PATCH] Fix from HEAD. --- ssl/d1_clnt.c | 4 ++-- ssl/d1_srvr.c | 4 ++-- ssl/s23_clnt.c | 4 ++-- ssl/s23_srvr.c | 2 +- ssl/s2_clnt.c | 2 +- ssl/s2_srvr.c | 2 +- ssl/s3_clnt.c | 4 ++-- ssl/s3_srvr.c | 4 ++-- ssl/ssl_asn1.c | 2 +- ssl/ssl_lib.c | 2 +- ssl/ssl_sess.c | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index f10b34bd70..e8b60a45d2 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -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)); diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 180fc6e646..475e6095fd 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -144,7 +144,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; @@ -666,7 +666,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 */ diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index 8bac26c5ac..ed4ee72393 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -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; diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 5cd00f850e..da4f377e76 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -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; diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 0c9e24d5c4..efb52485a7 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -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; diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index 247cc89155..27d71a2e09 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -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; diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index eb7e87f9b1..9f0a7f9ac3 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -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; diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index f762480a02..39a6aeba68 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -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; diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c index c274b94953..d129acc329 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -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); diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index dfc1bad52a..28c90fc68e 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1901,7 +1901,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)); } } } diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 5d00a98a74..da6b023c36 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -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; -- 2.34.1