Tolerate DTLS alerts with an incorrect version number
In the case of a protocol version alert being sent by a peer the record version number may not be what we are expecting. In DTLS records with an unexpected version number are silently discarded. This probably isn't appropriate for alerts, so we tolerate a mismatch in the minor version number. This resolves an issue reported on openssl-users where an OpenSSL server chose DTLS1.0 but the client was DTLS1.2 only and sent a protocol_version alert with a 1.2 record number. This was silently ignored by the server. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5018)
This commit is contained in:
parent
225f980d22
commit
08455bc9b0
1 changed files with 5 additions and 2 deletions
|
@ -1875,8 +1875,11 @@ int dtls1_get_record(SSL *s)
|
|||
|
||||
n2s(p, rr->length);
|
||||
|
||||
/* Lets check version */
|
||||
if (!s->first_packet) {
|
||||
/*
|
||||
* Lets check the version. We tolerate alerts that don't have the exact
|
||||
* version number (e.g. because of protocol version errors)
|
||||
*/
|
||||
if (!s->first_packet && rr->type != SSL3_RT_ALERT) {
|
||||
if (version != s->version) {
|
||||
/* unexpected version, silently discard */
|
||||
rr->length = 0;
|
||||
|
|
Loading…
Reference in a new issue