mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Address feedback on SSLv2 ClientHello processing

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2016-08-03 13:03:25 +01:00
parent a2a0c86bb0
commit 78fcddbb8d
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/record/rec_layer_s3.c
View File

@ -33,7 +33,7 @@
void RECORD_LAYER_init(RECORD_LAYER *rl, SSL *s)
{
rl->s = s;
RECORD_LAYER_set_first_record(&s->rlayer, 1);
RECORD_LAYER_set_first_record(&s->rlayer);
SSL3_RECORD_clear(rl->rrec, SSL_MAX_PIPELINES);
}

3
ssl/record/record_locl.h
View File

@ -32,7 +32,8 @@
((rl)->empty_record_count = 0)
#define RECORD_LAYER_get_empty_record_count(rl) ((rl)->empty_record_count)
#define RECORD_LAYER_is_first_record(rl) ((rl)->is_first_record)
#define RECORD_LAYER_set_first_record(rl, val) ((rl)->is_first_record = (val))
#define RECORD_LAYER_set_first_record(rl) ((rl)->is_first_record = 1)
#define RECORD_LAYER_clear_first_record(rl) ((rl)->is_first_record = 0)
#define DTLS_RECORD_LAYER_get_r_epoch(rl) ((rl)->d->r_epoch)
__owur int ssl3_read_n(SSL *s, int n, int max, int extend, int clearold);

15
ssl/record/ssl3_record.c
View File

@ -159,18 +159,9 @@ int ssl3_get_record(SSL *s)
p = RECORD_LAYER_get_packet(&s->rlayer);
/*
* Check whether this is a regular record or an SSLv2 style record.
* The latter can only be used in the first record of an initial
* ClientHello for old clients. Initial ClientHello means
* s->first_packet is set and s->server is true. The first record
* means s->rlayer.is_first_record is true. Probably this is
* sufficient in itself instead of s->first_packet, but I am
* cautious. We check s->read_hash and s->enc_read_ctx to ensure
* this does not apply during renegotiation.
* The first record received by the server may be a V2ClientHello.
*/
if (s->first_packet && s->server
&& RECORD_LAYER_is_first_record(&s->rlayer)
&& s->read_hash == NULL && s->enc_read_ctx == NULL
if (s->server && RECORD_LAYER_is_first_record(&s->rlayer)
&& (p[0] & 0x80) && (p[2] == SSL2_MT_CLIENT_HELLO)) {
/*
* SSLv2 style record
@ -342,7 +333,7 @@ int ssl3_get_record(SSL *s)
/* we have pulled in a full packet so zero things */
RECORD_LAYER_reset_packet_length(&s->rlayer);
RECORD_LAYER_set_first_record(&s->rlayer, 0);
RECORD_LAYER_clear_first_record(&s->rlayer);
} while (num_recs < max_recs
&& rr[num_recs-1].type == SSL3_RT_APPLICATION_DATA
&& SSL_USE_EXPLICIT_IV(s)