diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-10-14 10:08:35 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-11-02 16:01:59 +0100 |
| commit | f65da0e41df722aac97dc928cf05ad077b63d7db (patch) | |
| tree | 7cc4041bd91f0e486b984b46eb3709e11f45872c | |
| parent | aa88933ff1ca3b621e11d27a8c9c2a64efefc9b4 (diff) | |
| download | gnutls-f65da0e41df722aac97dc928cf05ad077b63d7db.tar.gz | |
record: disallow parsing of alert messages prior to session start
| -rw-r--r-- | lib/gnutls_record.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c index 6428459363..8dd375fa72 100644 --- a/lib/gnutls_record.c +++ b/lib/gnutls_record.c @@ -755,6 +755,12 @@ record_add_to_buffers(gnutls_session_t session, gnutls_alert_get_name((int) bufel->msg. data[1])); + if (!session->internals.initial_negotiation_completed && + session->internals.handshake_in_progress && STATE == STATE0) { /* handshake hasn't started */ + ret = gnutls_assert_val(GNUTLS_E_UNEXPECTED_PACKET); + goto unexpected_packet; + } + session->internals.last_alert = bufel->msg.data[1]; /* if close notify is received and @@ -771,7 +777,6 @@ record_add_to_buffers(gnutls_session_t session, /* if the alert is FATAL or WARNING * return the apropriate message */ - gnutls_assert(); ret = GNUTLS_E_WARNING_ALERT_RECEIVED; if (bufel->msg.data[0] == GNUTLS_AL_FATAL) { |