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

Control sending time with SSL_SEND_{CLIENT,SERVER}RANDOM_MODE

Browse Source 
(I'd rather use an option, but it appears that the options field is
full.)

Now, we send the time in the gmt_unix_time field if the appropriate
one of these mode options is set, but randomize the field if the flag
is not set.
This commit is contained in:
Nick Mathewson 2013-10-09 10:37:53 -04:00
parent 3da721dac9
commit 2583270191
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ssl/s23_clnt.c
View File

@ -273,7 +273,22 @@ static int ssl23_no_ssl2_ciphers(SSL *s)
* on failure, 1 on success. */ * on failure, 1 on success. */
int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len) int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len)
{ {
return RAND_pseudo_bytes(result, len); int send_time = 0;
if (len < 4)
return 0;
if (server)
send_time = (s->mode & SSL_MODE_SEND_SERVERHELLO_TIME) != 0;
else
send_time = (s->mode & SSL_MODE_SEND_CLIENTHELLO_TIME) != 0;
if (send_time)
{
unsigned long Time = time(NULL);
unsigned char *p = result;
l2n(Time, p);
return RAND_pseudo_bytes(p, len-4);
}
else
return RAND_pseudo_bytes(result, len);
} }
static int ssl23_client_hello(SSL *s) static int ssl23_client_hello(SSL *s)

6
ssl/ssl.h
View File

@ -641,6 +641,12 @@ struct ssl_session_st
* TLS only.) "Released" buffers are put onto a free-list in the context * TLS only.) "Released" buffers are put onto a free-list in the context
* or just freed (depending on the context's setting for freelist_max_len). */ * or just freed (depending on the context's setting for freelist_max_len). */
#define SSL_MODE_RELEASE_BUFFERS 0x00000010L #define SSL_MODE_RELEASE_BUFFERS 0x00000010L
/* Send the current time in the Random fields of the ClientHello and
* ServerHello records for compatibility with hypothetical implementations
* that require it.
*/
#define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020L
#define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040L
/* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value, /* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value,
* they cannot be used to clear bits. */ * they cannot be used to clear bits. */