diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-11-30 13:58:38 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-11-30 13:58:38 +0000 |
| commit | d92b77866b3bcb9eb1544d86e236a35d295ffe1f (patch) | |
| tree | 9f6215773961d74cd06f855d0610715e890bcfdd /libextra | |
| parent | 07053a732434bf4cadabb7fdf0e532348b5984a6 (diff) | |
| download | gnutls-d92b77866b3bcb9eb1544d86e236a35d295ffe1f.tar.gz | |
some fixes to comply with the SRP draft. The handshake is now repeated if an empty SRP username is received.
Diffstat (limited to 'libextra')
| -rw-r--r-- | libextra/auth_srp.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libextra/auth_srp.c b/libextra/auth_srp.c index 4bb8c432d3..9abd02ae60 100644 --- a/libextra/auth_srp.c +++ b/libextra/auth_srp.c @@ -32,6 +32,7 @@ #include "auth_srp.h" #include <gnutls_str.h> #include <gnutls_datum.h> +#include <gnutls_alert.h> int _gnutls_gen_srp_server_kx(gnutls_session, opaque **); int _gnutls_gen_srp_client_kx(gnutls_session, opaque **); @@ -84,10 +85,18 @@ int _gnutls_gen_srp_server_kx(gnutls_session state, opaque ** data) if (state->security_parameters.extensions.srp_username[0] == 0) { /* The peer didn't send a valid SRP extension with the - * SRP username. + * SRP username. The draft requires that we send an + * alert and start the handshake again. */ gnutls_assert(); - return GNUTLS_E_EMPTY_SRP_USERNAME; + ret = gnutls_alert_send( state, GNUTLS_AL_WARNING, + GNUTLS_A_MISSING_SRP_USERNAME); + if (ret < 0) { + gnutls_assert(); + return ret; + } + + return GNUTLS_E_INT_HANDSHAKE_AGAIN; } if ( (ret=_gnutls_auth_info_set( state, GNUTLS_CRD_SRP, sizeof( SRP_SERVER_AUTH_INFO_INT), 1)) < 0) { |