generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor {client,server}_random to call an intermediate function

Browse Source 
I'll be using this to make an option for randomizing the time.
This commit is contained in:
Nick Mathewson 2013-10-09 10:28:42 -04:00
parent f4c93b46ed
commit 3da721dac9
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/d1_clnt.c
View File

@ -801,7 +801,7 @@ int dtls1_client_hello(SSL *s)
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)) if (i==sizeof(s->s3->client_random))
{ {
RAND_pseudo_bytes(p,sizeof(s->s3->client_random)); ssl_fill_hello_random(s,0,p,sizeof(s->s3->client_random));
} }
/* Do the message type and length last */ /* Do the message type and length last */

2
ssl/d1_srvr.c
View File

@ -918,7 +918,7 @@ int dtls1_send_server_hello(SSL *s)
{ {
buf=(unsigned char *)s->init_buf->data; buf=(unsigned char *)s->init_buf->data;
p=s->s3->server_random; p=s->s3->server_random;
RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE); ssl_fill_hello_random(s, 1, p, SSL3_RANDOM_SIZE);
/* Do the message type and length last */ /* Do the message type and length last */
d=p= &(buf[DTLS1_HM_HEADER_LENGTH]); d=p= &(buf[DTLS1_HM_HEADER_LENGTH]);

9
ssl/s23_clnt.c
View File

@ -269,6 +269,13 @@ static int ssl23_no_ssl2_ciphers(SSL *s)
return 1; return 1;
} }
/* Fill a ClientRandom or ServerRandom field of length len. Returns <= 0
* on failure, 1 on success. */
int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len)
{
return RAND_pseudo_bytes(result, len);
}
static int ssl23_client_hello(SSL *s) static int ssl23_client_hello(SSL *s)
{ {
unsigned char *buf; unsigned char *buf;
@ -355,7 +362,7 @@ static int ssl23_client_hello(SSL *s)
#endif #endif
p=s->s3->client_random; p=s->s3->client_random;
if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE) <= 0) if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0)
return -1; return -1;
if (version == TLS1_2_VERSION) if (version == TLS1_2_VERSION)

3
ssl/s3_clnt.c
View File

@ -680,7 +680,8 @@ int ssl3_client_hello(SSL *s)
/* else use the pre-loaded session */ /* else use the pre-loaded session */
p=s->s3->client_random; p=s->s3->client_random;
if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE) <= 0)
if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0)
goto err; goto err;
/* Do the message type and length last */ /* Do the message type and length last */

4
ssl/s3_srvr.c
View File

@ -1194,8 +1194,8 @@ int ssl3_get_client_hello(SSL *s)
* SessionTicket processing to use it in key derivation. */ * SessionTicket processing to use it in key derivation. */
{ {
unsigned char *pos; unsigned char *pos;
pos=s->s3->server_random; pos=s->s3->server_random;
if (RAND_pseudo_bytes(pos,SSL3_RANDOM_SIZE) <= 0) if (ssl_fill_hello_random(s,1,pos,SSL3_RANDOM_SIZE) <= 0)
{ {
al=SSL_AD_INTERNAL_ERROR; al=SSL_AD_INTERNAL_ERROR;
goto f_err; goto f_err;

1
ssl/ssl_locl.h
View File

@ -847,6 +847,7 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher);
STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s);
int ssl_verify_alarm_type(long type); int ssl_verify_alarm_type(long type);
void ssl_load_ciphers(void); void ssl_load_ciphers(void);
int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, int len);
int ssl2_enc_init(SSL *s, int client); int ssl2_enc_init(SSL *s, int client);
int ssl2_generate_key_material(SSL *s); int ssl2_generate_key_material(SSL *s);