diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-09-10 19:16:40 +0000 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-09-10 19:16:40 +0000 |
commit | 295af68f1adf4a596f9541f066c16920de2b3b1a (patch) | |
tree | 42eceee842b34cde3db423e53efe7ef815d20ff6 | |
parent | ed7bd0b362c68b6067ba6b066e164962483d599d (diff) | |
download | gnutls-295af68f1adf4a596f9541f066c16920de2b3b1a.tar.gz |
*** empty log message ***
-rw-r--r-- | lib/gnutls_alert.c | 1 | ||||
-rw-r--r-- | lib/gnutls_errors.c | 1 | ||||
-rw-r--r-- | lib/gnutls_errors_int.h | 1 | ||||
-rw-r--r-- | libextra/auth_srp.c | 6 |
4 files changed, 3 insertions, 6 deletions
diff --git a/lib/gnutls_alert.c b/lib/gnutls_alert.c index 9ec90e0d97..be5d44291d 100644 --- a/lib/gnutls_alert.c +++ b/lib/gnutls_alert.c @@ -160,7 +160,6 @@ int _level = -1; _level = GNUTLS_AL_FATAL; break; case GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER: - case GNUTLS_E_ILLEGAL_SRP_PARAMS: case GNUTLS_E_ILLEGAL_SRP_USERNAME: ret = GNUTLS_A_ILLEGAL_PARAMETER; _level = GNUTLS_AL_FATAL; diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c index 85441d42d9..e13931ed34 100644 --- a/lib/gnutls_errors.c +++ b/lib/gnutls_errors.c @@ -133,7 +133,6 @@ static gnutls_error_entry error_algorithms[] = { ERROR_ENTRY("Could not get OpenPGP key.", GNUTLS_E_OPENPGP_GETKEY_FAILED, 1), ERROR_ENTRY("The SRP username supplied by the peer is illegal.", GNUTLS_E_ILLEGAL_SRP_USERNAME, 1), - ERROR_ENTRY("The SRP parameters sent by the peer are illegal.", GNUTLS_E_ILLEGAL_SRP_PARAMS, 1), ERROR_ENTRY("The peer advertized SRP but did not supply any SRP username.", GNUTLS_E_EMPTY_SRP_USERNAME, 1), ERROR_ENTRY("The OpenPGP fingerprint is not supported.", GNUTLS_E_OPENPGP_FINGERPRINT_UNSUPPORTED, 1), diff --git a/lib/gnutls_errors_int.h b/lib/gnutls_errors_int.h index 90841c1aa7..30dc5e1376 100644 --- a/lib/gnutls_errors_int.h +++ b/lib/gnutls_errors_int.h @@ -119,7 +119,6 @@ #define GNUTLS_E_BASE64_ENCODING_ERROR -201 #define GNUTLS_E_INCOMPATIBLE_GCRYPT_LIBRARY -202 -#define GNUTLS_E_ILLEGAL_SRP_PARAMS -203 #define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250 diff --git a/libextra/auth_srp.c b/libextra/auth_srp.c index 77e46fa7ae..f35ac7decf 100644 --- a/libextra/auth_srp.c +++ b/libextra/auth_srp.c @@ -447,7 +447,7 @@ static int check_g_n( const opaque* g, size_t n_g, { if (n_g != 1 || g[0] != srp_generator) - return GNUTLS_E_ILLEGAL_SRP_PARAMS; + return GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER; if (n_n == sizeof(srp_params_1024) && memcmp( srp_params_1024, n, n_n)==0) { @@ -464,7 +464,7 @@ static int check_g_n( const opaque* g, size_t n_g, return 0; } - return GNUTLS_E_ILLEGAL_SRP_PARAMS; + return GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER; } /* Check if N is a prime and G a generator of the @@ -474,7 +474,7 @@ static int group_check_g_n( GNUTLS_MPI g, GNUTLS_MPI n) { if (gcry_prime_check( n, 0) != 0) { gnutls_assert(); - return GNUTLS_E_ILLEGAL_SRP_PARAMS; + return GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER; } /* We should also check whether g is a generator, |