summaryrefslogtreecommitdiff
path: root/main/openssl/ssl/s23_clnt.c
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-04-23 12:31:35 +0200
committerArne Schwabe <arne@rfc2549.org>2014-04-23 12:31:35 +0200
commit0c5af0c28f23f75f93e253aeccb00c5ad20c116e (patch)
treefae9826018c36f1011007d029b728c290c50485c /main/openssl/ssl/s23_clnt.c
parentc69ba1780496c260a1b4498596bae428e0df232d (diff)
Update OpenSSL to 1.0.1g
Diffstat (limited to 'main/openssl/ssl/s23_clnt.c')
-rw-r--r--main/openssl/ssl/s23_clnt.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/main/openssl/ssl/s23_clnt.c b/main/openssl/ssl/s23_clnt.c
index fefcd167..2bc92141 100644
--- a/main/openssl/ssl/s23_clnt.c
+++ b/main/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);
@@ -487,10 +487,7 @@ static int ssl23_client_hello(SSL *s)
{
/* create Client Hello in SSL 3.0/TLS 1.0 format */
- /* do the record header (5 bytes) and handshake message
- * header (4 bytes) last. Note: the code to add the
- * padding extension in t1_lib.c depends on the size of
- * this prefix. */
+ /* do the record header (5 bytes) and handshake message header (4 bytes) last */
d = p = &(buf[9]);
*(p++) = version_major;