diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-06-22 18:36:22 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-06-26 21:51:25 +0200 |
| commit | 31435b02184346526da86b971b51005835168d0c (patch) | |
| tree | 9296f9af1c8eb9fef5b6a10e44e4e792b90cf560 /lib | |
| parent | f726b314a8d4ad8997872a7a65276bf0f0eda4c1 (diff) | |
| download | gnutls-31435b02184346526da86b971b51005835168d0c.tar.gz | |
MAX_SRP_USERNAME -> MAX_USERNAME_SIZE
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/auth_dhe_psk.c | 2 | ||||
| -rw-r--r-- | lib/auth_psk.c | 4 | ||||
| -rw-r--r-- | lib/auth_psk.h | 4 | ||||
| -rw-r--r-- | lib/auth_srp.c | 2 | ||||
| -rw-r--r-- | lib/auth_srp.h | 2 | ||||
| -rw-r--r-- | lib/ext_srp.c | 2 | ||||
| -rw-r--r-- | lib/gnutls_int.h | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/lib/auth_dhe_psk.c b/lib/auth_dhe_psk.c index 60da95cad7..f281b1df5a 100644 --- a/lib/auth_dhe_psk.c +++ b/lib/auth_dhe_psk.c @@ -217,7 +217,7 @@ proc_psk_client_kx (gnutls_session_t session, opaque * data, */ info = _gnutls_get_auth_info (session); - if (username.size > MAX_SRP_USERNAME) + if (username.size > MAX_USERNAME_SIZE) { gnutls_assert (); return GNUTLS_E_ILLEGAL_SRP_USERNAME; diff --git a/lib/auth_psk.c b/lib/auth_psk.c index 242f6c4f0b..b55203ab35 100644 --- a/lib/auth_psk.c +++ b/lib/auth_psk.c @@ -265,7 +265,7 @@ _gnutls_proc_psk_client_kx (gnutls_session_t session, opaque * data, */ info = _gnutls_get_auth_info (session); - if (username.size > MAX_SRP_USERNAME) + if (username.size > MAX_USERNAME_SIZE) { gnutls_assert (); return GNUTLS_E_ILLEGAL_SRP_USERNAME; @@ -377,7 +377,7 @@ _gnutls_proc_psk_server_kx (gnutls_session_t session, opaque * data, */ info = _gnutls_get_auth_info (session); - if (hint.size > MAX_SRP_USERNAME) + if (hint.size > MAX_USERNAME_SIZE) { gnutls_assert (); return GNUTLS_E_ILLEGAL_SRP_USERNAME; diff --git a/lib/auth_psk.h b/lib/auth_psk.h index 200ec97285..013ed0dfd0 100644 --- a/lib/auth_psk.h +++ b/lib/auth_psk.h @@ -57,9 +57,9 @@ typedef struct gnutls_psk_server_credentials_st /* these structures should not use allocated data */ typedef struct psk_auth_info_st { - char username[MAX_SRP_USERNAME + 1]; + char username[MAX_USERNAME_SIZE + 1]; dh_info_st dh; - char hint[MAX_SRP_USERNAME + 1]; + char hint[MAX_USERNAME_SIZE + 1]; } *psk_auth_info_t; diff --git a/lib/auth_srp.c b/lib/auth_srp.c index 43e463b2aa..54bfd10124 100644 --- a/lib/auth_srp.c +++ b/lib/auth_srp.c @@ -165,7 +165,7 @@ _gnutls_gen_srp_server_kx (gnutls_session_t session, opaque ** data) info = _gnutls_get_auth_info (session); username = info->username; - _gnutls_str_cpy (username, MAX_SRP_USERNAME, priv->username); + _gnutls_str_cpy (username, MAX_USERNAME_SIZE, priv->username); ret = _gnutls_srp_pwd_read_entry (session, username, &pwd_entry); diff --git a/lib/auth_srp.h b/lib/auth_srp.h index 40cb97a7d6..3b20fe7489 100644 --- a/lib/auth_srp.h +++ b/lib/auth_srp.h @@ -48,7 +48,7 @@ typedef struct gnutls_srp_server_credentials_st /* these structures should not use allocated data */ typedef struct srp_server_auth_info_st { - char username[MAX_SRP_USERNAME + 1]; + char username[MAX_USERNAME_SIZE + 1]; } *srp_server_auth_info_t; #ifdef ENABLE_SRP diff --git a/lib/ext_srp.c b/lib/ext_srp.c index 7c36de0ffe..868714c979 100644 --- a/lib/ext_srp.c +++ b/lib/ext_srp.c @@ -71,7 +71,7 @@ _gnutls_srp_recv_params (gnutls_session_t session, const opaque * data, len = data[0]; DECR_LEN (data_size, len); - if (MAX_SRP_USERNAME < len) + if (MAX_USERNAME_SIZE < len) { gnutls_assert (); return GNUTLS_E_ILLEGAL_SRP_USERNAME; diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index 36b40a9864..d9b7fe7331 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -84,7 +84,7 @@ typedef struct #define MAX_CIPHER_BLOCK_SIZE 16 #define MAX_CIPHER_KEY_SIZE 32 -#define MAX_SRP_USERNAME 128 +#define MAX_USERNAME_SIZE 128 #define MAX_SERVER_NAME_SIZE 128 #define SESSION_TICKET_KEY_NAME_SIZE 16 |