diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-09-25 12:27:48 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2014-09-25 12:29:49 +0200 |
| commit | 19eff0b4c1343e43c2c1f0893043d9a1d43b94af (patch) | |
| tree | 93b1621180091978dff63ffda9a49bb50102d59e | |
| parent | 8eadefaee8d4d5bfdb829e343c0e1053238d9d55 (diff) | |
| download | gnutls-19eff0b4c1343e43c2c1f0893043d9a1d43b94af.tar.gz | |
restrict the number of non-fatal errors gnutls_handshake() can return
Conflicts:
lib/gnutls_record.c
| -rw-r--r-- | lib/gnutls_handshake.c | 4 | ||||
| -rw-r--r-- | lib/gnutls_record.c | 7 | ||||
| -rw-r--r-- | lib/gnutls_record.h | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c index c2ed3d065a..bdabb4dad6 100644 --- a/lib/gnutls_handshake.c +++ b/lib/gnutls_handshake.c @@ -2544,12 +2544,14 @@ gnutls_handshake_set_timeout (gnutls_session_t session, unsigned int ms) #define IMED_RET( str, ret, allow_alert) do { \ if (ret < 0) { \ /* EAGAIN and INTERRUPTED are always non-fatal */ \ - if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED) \ + if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_LARGE_PACKET) \ return ret; \ /* a warning alert might interrupt handshake */ \ if (allow_alert != 0 && ret==GNUTLS_E_WARNING_ALERT_RECEIVED) return ret; \ gnutls_assert(); \ ERR( str, ret); \ + if (gnutls_error_is_fatal(ret) == 0) ret = gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR); \ + session_invalidate(session); \ _gnutls_handshake_hash_buffers_clear(session); \ return ret; \ } } while (0) diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c index d866a28c6d..1b86e5eda4 100644 --- a/lib/gnutls_record.c +++ b/lib/gnutls_record.c @@ -354,13 +354,6 @@ gnutls_bye (gnutls_session_t session, gnutls_close_request_t how) } inline static void -session_invalidate (gnutls_session_t session) -{ - session->internals.invalid_connection = 1; -} - - -inline static void session_unresumable (gnutls_session_t session) { session->internals.resumable = RESUME_FALSE; diff --git a/lib/gnutls_record.h b/lib/gnutls_record.h index 6e86ed5947..15e4dd5b47 100644 --- a/lib/gnutls_record.h +++ b/lib/gnutls_record.h @@ -47,4 +47,9 @@ ssize_t _gnutls_recv_int (gnutls_session_t session, content_type_t type, size_t sizeofdata, void* seq, unsigned int ms); int _gnutls_get_max_decrypted_data(gnutls_session_t session); +inline static void session_invalidate(gnutls_session_t session) +{ + session->internals.invalid_connection = 1; +} + #endif |