summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-10-20 15:08:58 -0700
committerBen Laurie <ben@links.org>2013-10-21 03:37:20 +0100
commit2927791d77ddaef687e92b1779e0bff89bdc279f (patch)
treea1334509a9c0f0b6c00caeab06ee0a4bcc631e49
parent2016265dfbab162ec30718b5e7480add42598158 (diff)
Fix another gmt_unix_time case in server_random
-rw-r--r--ssl/s3_srvr.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 92181bb4af..bfd05242e8 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1493,19 +1493,13 @@ int ssl3_send_server_hello(SSL *s)
unsigned char *p,*d;
int i,sl;
unsigned long l;
-#ifdef OPENSSL_NO_TLSEXT
- unsigned long Time;
-#endif
if (s->state == SSL3_ST_SW_SRVR_HELLO_A)
{
buf=(unsigned char *)s->init_buf->data;
#ifdef OPENSSL_NO_TLSEXT
p=s->s3->server_random;
- /* Generate server_random if it was not needed previously */
- Time=(unsigned long)time(NULL); /* Time */
- l2n(Time,p);
- if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
+ if (ssl_fill_hello_random(s, 1, p, SSL3_RANDOM_SIZE) <= 0)
return -1;
#endif
/* Do the message type and length last */