This commit is contained in:
Ben Laurie 2013-10-19 12:34:15 +01:00
parent 62036c6fc3
commit 34e43b909f
3 changed files with 4 additions and 4 deletions

View File

@ -798,11 +798,10 @@ int dtls1_client_hello(SSL *s)
/* if client_random is initialized, reuse it, we are
* required to use same upon reply to HelloVerify */
for (i=0;p[i]=='\0' && i<sizeof(s->s3->client_random);i++) ;
for (i=0;p[i]=='\0' && i<sizeof(s->s3->client_random);i++)
;
if (i==sizeof(s->s3->client_random))
{
ssl_fill_hello_random(s,0,p,sizeof(s->s3->client_random));
}
/* Do the message type and length last */
d=p= &(buf[DTLS1_HM_HEADER_LENGTH]);

View File

@ -274,6 +274,7 @@ static int ssl23_no_ssl2_ciphers(SSL *s)
int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len)
{
int send_time = 0;
if (len < 4)
return 0;
if (server)

View File

@ -1195,7 +1195,7 @@ int ssl3_get_client_hello(SSL *s)
{
unsigned char *pos;
pos=s->s3->server_random;
if (ssl_fill_hello_random(s,1,pos,SSL3_RANDOM_SIZE) <= 0)
if (ssl_fill_hello_random(s, 1, pos, SSL3_RANDOM_SIZE) <= 0)
{
al=SSL_AD_INTERNAL_ERROR;
goto f_err;