_gnutls_session_supports_group: return boolean instead of error code

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/lib/auth/ecdhe.c b/lib/auth/ecdhe.c
index ce59be0ca82a472b821d81d9edb845a4d98ae093..cc7c8569e26c5c5192833b5838fb633784e708e2 100644 (file)
--- a/lib/auth/ecdhe.c
+++ b/lib/auth/ecdhe.c
@@ -351,9 +351,8 @@ int _gnutls_proc_ecdh_common_server_kx(gnutls_session_t session, uint8_t *data,
 
        i += 2;
 
-       ret = _gnutls_session_supports_group(session, group->id);
-       if (ret < 0)
-               return gnutls_assert_val(ret);
+       if (!_gnutls_session_supports_group(session, group->id))
+               return gnutls_assert_val(GNUTLS_E_ECC_UNSUPPORTED_CURVE);
 
        ecurve = _gnutls_ecc_curve_get_params(group->curve);
        if (ecurve == NULL) {

diff --git a/lib/auth/vko_gost.c b/lib/auth/vko_gost.c
index 6b49f7b01241a67b70b94c18b4c2c5a6cf6be421..1895a9e01d35a54862ce37d37a14b00598762caf 100644 (file)
--- a/lib/auth/vko_gost.c
+++ b/lib/auth/vko_gost.c
@@ -144,9 +144,8 @@ static int vko_prepare_client_keys(gnutls_session_t session,
                _gnutls_debug_log("received curve %s\n", group->name);
        }
 
-       ret = _gnutls_session_supports_group(session, group->id);
-       if (ret < 0)
-               return gnutls_assert_val(ret);
+       if (!_gnutls_session_supports_group(session, group->id))
+               return gnutls_assert_val(GNUTLS_E_ECC_UNSUPPORTED_CURVE);
 
        if (pub->algo == GNUTLS_PK_GOST_12_512) {
                gnutls_sign_algorithm_set_server(session, GNUTLS_SIGN_GOST_512);

diff --git a/lib/ext/key_share.c b/lib/ext/key_share.c
index 70495eac99106f147018e55d9cdb91e7774275f2..caf823d35eaad9ea025a11202969e73b979dc74f 100644 (file)
--- a/lib/ext/key_share.c
+++ b/lib/ext/key_share.c
@@ -906,13 +906,12 @@ static int key_share_recv_params(gnutls_session_t session, const uint8_t *data,
                                group->name);
 
                        /* check if we support it */
-                       ret = _gnutls_session_supports_group(session,
-                                                            group->id);
-                       if (ret < 0) {
+                       if (!_gnutls_session_supports_group(session,
+                                                           group->id)) {
                                _gnutls_handshake_log(
                                        "EXT[%p]: received share for %s which is disabled\n",
                                        session, group->name);
-                               return gnutls_assert_val(ret);
+                               return gnutls_assert_val(GNUTLS_E_ECC_UNSUPPORTED_CURVE);
                        }
 
                        _gnutls_session_group_set(session, group);
@@ -939,12 +938,11 @@ static int key_share_recv_params(gnutls_session_t session, const uint8_t *data,
                                GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER);
 
                /* check if we support it */
-               ret = _gnutls_session_supports_group(session, group->id);
-               if (ret < 0) {
+               if (!_gnutls_session_supports_group(session, group->id)) {
                        _gnutls_handshake_log(
                                "EXT[%p]: received share for %s which is disabled\n",
                                session, group->name);
-                       return gnutls_assert_val(ret);
+                       return gnutls_assert_val(GNUTLS_E_ECC_UNSUPPORTED_CURVE);
                }
 
                _gnutls_session_group_set(session, group);

diff --git a/lib/ext/supported_groups.c b/lib/ext/supported_groups.c
index 5461c868e76ccc543aabe1b7ebe2330dbe6e1d09..ebad0068f6241735f5eeb4cdb623feb13e349c38 100644 (file)
--- a/lib/ext/supported_groups.c
+++ b/lib/ext/supported_groups.c
@@ -309,14 +309,14 @@ static int _gnutls_supported_groups_send_params(gnutls_session_t session,
 /* Returns 0 if the given ECC curve is allowed in the current
  * session. A negative error value is returned otherwise.
  */
-int _gnutls_session_supports_group(gnutls_session_t session, unsigned int group)
+bool _gnutls_session_supports_group(gnutls_session_t session, unsigned int group)
 {
        unsigned i;
 
        for (i = 0; i < session->internals.priorities->groups.size; i++) {
                if (session->internals.priorities->groups.entry[i]->id == group)
-                       return 0;
+                       return true;
        }
 
-       return GNUTLS_E_ECC_UNSUPPORTED_CURVE;
+       return false;
 }

diff --git a/lib/ext/supported_groups.h b/lib/ext/supported_groups.h
index c53371c6e894979482f289fc80a428489c75a138..bef0941c70f70974f29347c3da2e327e42bd5a0e 100644 (file)
--- a/lib/ext/supported_groups.h
+++ b/lib/ext/supported_groups.h
@@ -27,7 +27,7 @@
 
 extern const hello_ext_entry_st ext_mod_supported_groups;
 
-int _gnutls_session_supports_group(gnutls_session_t session,
-                                  unsigned int group);
+bool _gnutls_session_supports_group(gnutls_session_t session,
+                                   unsigned int group);
 
 #endif /* GNUTLS_LIB_EXT_SUPPORTED_GROUPS_H */