diff options
| author | Nikos <nmav@crystal.(none)> | 2007-12-09 12:49:55 +0200 |
|---|---|---|
| committer | Nikos <nmav@crystal.(none)> | 2007-12-09 12:49:55 +0200 |
| commit | 3d5af6621fb49e326be35b99cec8556d8c8315ca (patch) | |
| tree | 71c578c93bcd665a4ac55d204453cba3fa2574e4 /lib/gnutls_v2_compat.c | |
| parent | fd043564b805a1ee1823bfad28a967a6e49bc0d7 (diff) | |
| download | gnutls-3d5af6621fb49e326be35b99cec8556d8c8315ca.tar.gz | |
user_hello_func is call always. Even when resuming a session.
Diffstat (limited to 'lib/gnutls_v2_compat.c')
| -rw-r--r-- | lib/gnutls_v2_compat.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/lib/gnutls_v2_compat.c b/lib/gnutls_v2_compat.c index b065a34d0f..95cbd2ff65 100644 --- a/lib/gnutls_v2_compat.c +++ b/lib/gnutls_v2_compat.c @@ -154,21 +154,11 @@ _gnutls_read_client_hello_v2 (gnutls_session_t session, opaque * data, /* call the user hello callback */ - if (session->internals.user_hello_func != NULL) + ret = _gnutls_user_hello_func( session, adv_version); + if (ret < 0) { - ret = session->internals.user_hello_func( session); - if (ret < 0) - { - gnutls_assert(); - return ret; - } - - ret = _gnutls_negotiate_version( session, adv_version); - if (ret < 0) - { - gnutls_assert (); - return ret; - } + gnutls_assert(); + return ret; } /* find an appropriate cipher suite */ @@ -242,7 +232,7 @@ _gnutls_read_client_hello_v2 (gnutls_session_t session, opaque * data, ret = _gnutls_server_restore_session (session, session_id, session_id_len); if (ret == 0) - { /* resumed! */ + { /* resumed! */ /* get the new random values */ memcpy (session->internals.resumed_security_parameters. server_random, session->security_parameters.server_random, |