From 76c93d23c073ef8b885503b7d28a31ffe2add6d8 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Fri, 8 Nov 2013 22:14:07 +0100 Subject: reindented code --- lib/algorithms/kx.c | 246 +++++++++++++++++++++++++--------------------------- 1 file changed, 117 insertions(+), 129 deletions(-) (limited to 'lib/algorithms/kx.c') diff --git a/lib/algorithms/kx.c b/lib/algorithms/kx.c index eb7e11ac78..3fa8a317e0 100644 --- a/lib/algorithms/kx.c +++ b/lib/algorithms/kx.c @@ -46,30 +46,33 @@ extern mod_auth_st srp_dss_auth_struct; * FIXME: The mappings are not 1-1. Some KX such as SRP_RSA require * more than one credentials type. */ -typedef struct -{ - gnutls_kx_algorithm_t algorithm; - gnutls_credentials_type_t client_type; - gnutls_credentials_type_t server_type; /* The type of credentials a server - * needs to set */ +typedef struct { + gnutls_kx_algorithm_t algorithm; + gnutls_credentials_type_t client_type; + gnutls_credentials_type_t server_type; /* The type of credentials a server + * needs to set */ } gnutls_cred_map; static const gnutls_cred_map cred_mappings[] = { - {GNUTLS_KX_ANON_DH, GNUTLS_CRD_ANON, GNUTLS_CRD_ANON}, - {GNUTLS_KX_ANON_ECDH, GNUTLS_CRD_ANON, GNUTLS_CRD_ANON}, - {GNUTLS_KX_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE}, - {GNUTLS_KX_ECDHE_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE}, - {GNUTLS_KX_ECDHE_ECDSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE}, - {GNUTLS_KX_DHE_DSS, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE}, - {GNUTLS_KX_DHE_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE}, - {GNUTLS_KX_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK}, - {GNUTLS_KX_DHE_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK}, - {GNUTLS_KX_RSA_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_CERTIFICATE}, - {GNUTLS_KX_ECDHE_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK}, - {GNUTLS_KX_SRP, GNUTLS_CRD_SRP, GNUTLS_CRD_SRP}, - {GNUTLS_KX_SRP_RSA, GNUTLS_CRD_SRP, GNUTLS_CRD_CERTIFICATE}, - {GNUTLS_KX_SRP_DSS, GNUTLS_CRD_SRP, GNUTLS_CRD_CERTIFICATE}, - {0, 0, 0} + {GNUTLS_KX_ANON_DH, GNUTLS_CRD_ANON, GNUTLS_CRD_ANON}, + {GNUTLS_KX_ANON_ECDH, GNUTLS_CRD_ANON, GNUTLS_CRD_ANON}, + {GNUTLS_KX_RSA, GNUTLS_CRD_CERTIFICATE, GNUTLS_CRD_CERTIFICATE}, + {GNUTLS_KX_ECDHE_RSA, GNUTLS_CRD_CERTIFICATE, + GNUTLS_CRD_CERTIFICATE}, + {GNUTLS_KX_ECDHE_ECDSA, GNUTLS_CRD_CERTIFICATE, + GNUTLS_CRD_CERTIFICATE}, + {GNUTLS_KX_DHE_DSS, GNUTLS_CRD_CERTIFICATE, + GNUTLS_CRD_CERTIFICATE}, + {GNUTLS_KX_DHE_RSA, GNUTLS_CRD_CERTIFICATE, + GNUTLS_CRD_CERTIFICATE}, + {GNUTLS_KX_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK}, + {GNUTLS_KX_DHE_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK}, + {GNUTLS_KX_RSA_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_CERTIFICATE}, + {GNUTLS_KX_ECDHE_PSK, GNUTLS_CRD_PSK, GNUTLS_CRD_PSK}, + {GNUTLS_KX_SRP, GNUTLS_CRD_SRP, GNUTLS_CRD_SRP}, + {GNUTLS_KX_SRP_RSA, GNUTLS_CRD_SRP, GNUTLS_CRD_CERTIFICATE}, + {GNUTLS_KX_SRP_DSS, GNUTLS_CRD_SRP, GNUTLS_CRD_CERTIFICATE}, + {0, 0, 0} }; #define GNUTLS_KX_MAP_LOOP(b) \ @@ -79,48 +82,48 @@ static const gnutls_cred_map cred_mappings[] = { #define GNUTLS_KX_MAP_ALG_LOOP_SERVER(a) \ GNUTLS_KX_MAP_LOOP( if(p->server_type == type) { a; break; }) -struct gnutls_kx_algo_entry -{ - const char *name; - gnutls_kx_algorithm_t algorithm; - mod_auth_st *auth_struct; - int needs_dh_params; +struct gnutls_kx_algo_entry { + const char *name; + gnutls_kx_algorithm_t algorithm; + mod_auth_st *auth_struct; + int needs_dh_params; }; typedef struct gnutls_kx_algo_entry gnutls_kx_algo_entry; static const gnutls_kx_algo_entry _gnutls_kx_algorithms[] = { #if defined(ENABLE_ANON) && defined(ENABLE_DHE) - {"ANON-DH", GNUTLS_KX_ANON_DH, &anon_auth_struct, 1}, + {"ANON-DH", GNUTLS_KX_ANON_DH, &anon_auth_struct, 1}, #endif #if defined(ENABLE_ANON) && defined(ENABLE_ECDHE) - {"ANON-ECDH", GNUTLS_KX_ANON_ECDH, &anon_ecdh_auth_struct, 0}, + {"ANON-ECDH", GNUTLS_KX_ANON_ECDH, &anon_ecdh_auth_struct, 0}, #endif - {"RSA", GNUTLS_KX_RSA, &rsa_auth_struct}, + {"RSA", GNUTLS_KX_RSA, &rsa_auth_struct}, #ifdef ENABLE_DHE - {"DHE-RSA", GNUTLS_KX_DHE_RSA, &dhe_rsa_auth_struct, 1}, - {"DHE-DSS", GNUTLS_KX_DHE_DSS, &dhe_dss_auth_struct, 1}, + {"DHE-RSA", GNUTLS_KX_DHE_RSA, &dhe_rsa_auth_struct, 1}, + {"DHE-DSS", GNUTLS_KX_DHE_DSS, &dhe_dss_auth_struct, 1}, #endif #ifdef ENABLE_ECDHE - {"ECDHE-RSA", GNUTLS_KX_ECDHE_RSA, &ecdhe_rsa_auth_struct, 0}, - {"ECDHE-ECDSA", GNUTLS_KX_ECDHE_ECDSA, &ecdhe_ecdsa_auth_struct, 0}, + {"ECDHE-RSA", GNUTLS_KX_ECDHE_RSA, &ecdhe_rsa_auth_struct, 0}, + {"ECDHE-ECDSA", GNUTLS_KX_ECDHE_ECDSA, &ecdhe_ecdsa_auth_struct, + 0}, #endif #ifdef ENABLE_SRP - {"SRP-DSS", GNUTLS_KX_SRP_DSS, &srp_dss_auth_struct, 0}, - {"SRP-RSA", GNUTLS_KX_SRP_RSA, &srp_rsa_auth_struct, 0}, - {"SRP", GNUTLS_KX_SRP, &srp_auth_struct, 0}, + {"SRP-DSS", GNUTLS_KX_SRP_DSS, &srp_dss_auth_struct, 0}, + {"SRP-RSA", GNUTLS_KX_SRP_RSA, &srp_rsa_auth_struct, 0}, + {"SRP", GNUTLS_KX_SRP, &srp_auth_struct, 0}, #endif #ifdef ENABLE_PSK - {"PSK", GNUTLS_KX_PSK, &psk_auth_struct, 0}, - {"RSA-PSK", GNUTLS_KX_RSA_PSK, &rsa_psk_auth_struct, 0}, -# ifdef ENABLE_DHE - {"DHE-PSK", GNUTLS_KX_DHE_PSK, &dhe_psk_auth_struct, - 1 /* needs DHE params */}, -# endif -# ifdef ENABLE_ECDHE - {"ECDHE-PSK", GNUTLS_KX_ECDHE_PSK, &ecdhe_psk_auth_struct, 0}, -# endif + {"PSK", GNUTLS_KX_PSK, &psk_auth_struct, 0}, + {"RSA-PSK", GNUTLS_KX_RSA_PSK, &rsa_psk_auth_struct, 0}, +#ifdef ENABLE_DHE + {"DHE-PSK", GNUTLS_KX_DHE_PSK, &dhe_psk_auth_struct, + 1 /* needs DHE params */ }, +#endif +#ifdef ENABLE_ECDHE + {"ECDHE-PSK", GNUTLS_KX_ECDHE_PSK, &ecdhe_psk_auth_struct, 0}, #endif - {0, 0, 0, 0} +#endif + {0, 0, 0, 0} }; #define GNUTLS_KX_LOOP(b) \ @@ -132,26 +135,25 @@ static const gnutls_kx_algo_entry _gnutls_kx_algorithms[] = { /* Key EXCHANGE functions */ -mod_auth_st * -_gnutls_kx_auth_struct (gnutls_kx_algorithm_t algorithm) +mod_auth_st *_gnutls_kx_auth_struct(gnutls_kx_algorithm_t algorithm) { - mod_auth_st *ret = NULL; - GNUTLS_KX_ALG_LOOP (ret = p->auth_struct); - return ret; + mod_auth_st *ret = NULL; + GNUTLS_KX_ALG_LOOP(ret = p->auth_struct); + return ret; } int -_gnutls_kx_priority (gnutls_session_t session, - gnutls_kx_algorithm_t algorithm) +_gnutls_kx_priority(gnutls_session_t session, + gnutls_kx_algorithm_t algorithm) { - unsigned int i; - for (i = 0; i < session->internals.priorities.kx.algorithms; i++) - { - if (session->internals.priorities.kx.priority[i] == algorithm) - return i; - } - return -1; + unsigned int i; + for (i = 0; i < session->internals.priorities.kx.algorithms; i++) { + if (session->internals.priorities.kx.priority[i] == + algorithm) + return i; + } + return -1; } /** @@ -163,15 +165,14 @@ _gnutls_kx_priority (gnutls_session_t session, * Returns: a pointer to a string that contains the name of the * specified key exchange algorithm, or %NULL. **/ -const char * -gnutls_kx_get_name (gnutls_kx_algorithm_t algorithm) +const char *gnutls_kx_get_name(gnutls_kx_algorithm_t algorithm) { - const char *ret = NULL; + const char *ret = NULL; - /* avoid prefix */ - GNUTLS_KX_ALG_LOOP (ret = p->name); + /* avoid prefix */ + GNUTLS_KX_ALG_LOOP(ret = p->name); - return ret; + return ret; } /** @@ -184,20 +185,18 @@ gnutls_kx_get_name (gnutls_kx_algorithm_t algorithm) * Returns: an id of the specified KX algorithm, or %GNUTLS_KX_UNKNOWN * on error. **/ -gnutls_kx_algorithm_t -gnutls_kx_get_id (const char *name) +gnutls_kx_algorithm_t gnutls_kx_get_id(const char *name) { - gnutls_kx_algorithm_t ret = GNUTLS_KX_UNKNOWN; + gnutls_kx_algorithm_t ret = GNUTLS_KX_UNKNOWN; - GNUTLS_KX_LOOP ( - if (strcasecmp (p->name, name) == 0) - { - ret = p->algorithm; - break; - } - ); + GNUTLS_KX_LOOP( + if (strcasecmp(p->name, name) == 0) { + ret = p->algorithm; + break; + } + ); - return ret; + return ret; } /** @@ -210,77 +209,66 @@ gnutls_kx_get_id (const char *name) * Returns: a (0)-terminated list of #gnutls_kx_algorithm_t integers * indicating the available key exchange algorithms. **/ -const gnutls_kx_algorithm_t * -gnutls_kx_list (void) +const gnutls_kx_algorithm_t *gnutls_kx_list(void) { -static gnutls_kx_algorithm_t supported_kxs[MAX_ALGOS] = {0}; + static gnutls_kx_algorithm_t supported_kxs[MAX_ALGOS] = { 0 }; - if (supported_kxs[0] == 0) - { - int i = 0; + if (supported_kxs[0] == 0) { + int i = 0; - GNUTLS_KX_LOOP (supported_kxs[i++]=p->algorithm); - supported_kxs[i++]=0; - } + GNUTLS_KX_LOOP(supported_kxs[i++] = p->algorithm); + supported_kxs[i++] = 0; + } - return supported_kxs; + return supported_kxs; } -int -_gnutls_kx_is_ok (gnutls_kx_algorithm_t algorithm) +int _gnutls_kx_is_ok(gnutls_kx_algorithm_t algorithm) { - ssize_t ret = -1; - GNUTLS_KX_ALG_LOOP (ret = p->algorithm); - if (ret >= 0) - ret = 0; - else - ret = 1; - return ret; + ssize_t ret = -1; + GNUTLS_KX_ALG_LOOP(ret = p->algorithm); + if (ret >= 0) + ret = 0; + else + ret = 1; + return ret; } -int -_gnutls_kx_needs_dh_params (gnutls_kx_algorithm_t algorithm) +int _gnutls_kx_needs_dh_params(gnutls_kx_algorithm_t algorithm) { - ssize_t ret = 0; - GNUTLS_KX_ALG_LOOP (ret = p->needs_dh_params); - return ret; + ssize_t ret = 0; + GNUTLS_KX_ALG_LOOP(ret = p->needs_dh_params); + return ret; } /* Type to KX mappings */ gnutls_kx_algorithm_t -_gnutls_map_kx_get_kx (gnutls_credentials_type_t type, int server) +_gnutls_map_kx_get_kx(gnutls_credentials_type_t type, int server) { - gnutls_kx_algorithm_t ret = -1; - - if (server) - { - GNUTLS_KX_MAP_ALG_LOOP_SERVER (ret = p->algorithm); - } - else - { - GNUTLS_KX_MAP_ALG_LOOP_SERVER (ret = p->algorithm); - } - return ret; + gnutls_kx_algorithm_t ret = -1; + + if (server) { + GNUTLS_KX_MAP_ALG_LOOP_SERVER(ret = p->algorithm); + } else { + GNUTLS_KX_MAP_ALG_LOOP_SERVER(ret = p->algorithm); + } + return ret; } /* Returns the credentials type required for this * Key exchange method. */ gnutls_credentials_type_t -_gnutls_map_kx_get_cred (gnutls_kx_algorithm_t algorithm, int server) +_gnutls_map_kx_get_cred(gnutls_kx_algorithm_t algorithm, int server) { - gnutls_credentials_type_t ret = -1; - if (server) - { - GNUTLS_KX_MAP_LOOP (if (p->algorithm == algorithm) ret = - p->server_type); - } - else - { - GNUTLS_KX_MAP_LOOP (if (p->algorithm == algorithm) ret = - p->client_type); - } - - return ret; + gnutls_credentials_type_t ret = -1; + if (server) { + GNUTLS_KX_MAP_LOOP(if (p->algorithm == algorithm) ret = + p->server_type); + } else { + GNUTLS_KX_MAP_LOOP(if (p->algorithm == algorithm) ret = + p->client_type); + } + + return ret; } - -- cgit v1.2.1