diff options
| author | jkim <jkim@FreeBSD.org> | 2014-04-08 21:06:58 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-04-08 21:06:58 +0000 |
| commit | 89b378c4b34c70b60981e17ea385f14c9e285912 (patch) | |
| tree | 782ade2dc94388e4ddc56b20d9c7ccf578d61077 /crypto/openssl/ssl/s23_clnt.c | |
| parent | 808e531530813c805e5f01db2b51e22340fd77a6 (diff) | |
| download | FreeBSD-src-89b378c4b34c70b60981e17ea385f14c9e285912.zip FreeBSD-src-89b378c4b34c70b60981e17ea385f14c9e285912.tar.gz | |
Merge OpenSSL 1.0.1g.
Approved by: benl (maintainer)
Diffstat (limited to 'crypto/openssl/ssl/s23_clnt.c')
| -rw-r--r-- | crypto/openssl/ssl/s23_clnt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s23_clnt.c b/crypto/openssl/ssl/s23_clnt.c index 84670b6..2b93c63 100644 --- a/crypto/openssl/ssl/s23_clnt.c +++ b/crypto/openssl/ssl/s23_clnt.c @@ -283,7 +283,7 @@ int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len) send_time = (s->mode & SSL_MODE_SEND_CLIENTHELLO_TIME) != 0; if (send_time) { - unsigned long Time = time(NULL); + unsigned long Time = (unsigned long)time(NULL); unsigned char *p = result; l2n(Time, p); return RAND_pseudo_bytes(p, len-4); |
