diff options
author | djm <> | 2006-06-27 05:05:42 +0000 |
---|---|---|
committer | djm <> | 2006-06-27 05:05:42 +0000 |
commit | f6198d4d0ab97685dc56be2d48715ed39fcc74b9 (patch) | |
tree | 6e28360095ed5ba5ef1760a419c43eef4ef6946b /src/lib/libssl/s3_clnt.c | |
parent | 0ff0f9d99c40072de315264b0f602bd639e7f662 (diff) | |
download | openbsd-f6198d4d0ab97685dc56be2d48715ed39fcc74b9.tar.gz openbsd-f6198d4d0ab97685dc56be2d48715ed39fcc74b9.tar.bz2 openbsd-f6198d4d0ab97685dc56be2d48715ed39fcc74b9.zip |
import of openssl-0.9.7j
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index 0969476b25..05194fdb31 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -165,7 +165,7 @@ SSL_METHOD *SSLv3_client_method(void) | |||
165 | int ssl3_connect(SSL *s) | 165 | int ssl3_connect(SSL *s) |
166 | { | 166 | { |
167 | BUF_MEM *buf=NULL; | 167 | BUF_MEM *buf=NULL; |
168 | unsigned long Time=time(NULL),l; | 168 | unsigned long Time=(unsigned long)time(NULL),l; |
169 | long num1; | 169 | long num1; |
170 | void (*cb)(const SSL *ssl,int type,int val)=NULL; | 170 | void (*cb)(const SSL *ssl,int type,int val)=NULL; |
171 | int ret= -1; | 171 | int ret= -1; |
@@ -533,7 +533,7 @@ static int ssl3_client_hello(SSL *s) | |||
533 | /* else use the pre-loaded session */ | 533 | /* else use the pre-loaded session */ |
534 | 534 | ||
535 | p=s->s3->client_random; | 535 | p=s->s3->client_random; |
536 | Time=time(NULL); /* Time */ | 536 | Time=(unsigned long)time(NULL); /* Time */ |
537 | l2n(Time,p); | 537 | l2n(Time,p); |
538 | if(RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0) | 538 | if(RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0) |
539 | goto err; | 539 | goto err; |
@@ -567,7 +567,7 @@ static int ssl3_client_hello(SSL *s) | |||
567 | } | 567 | } |
568 | 568 | ||
569 | /* Ciphers supported */ | 569 | /* Ciphers supported */ |
570 | i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2])); | 570 | i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),0); |
571 | if (i == 0) | 571 | if (i == 0) |
572 | { | 572 | { |
573 | SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE); | 573 | SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE); |