Unified abbreviation for certificate type priorities in code.

Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>

diff --git a/lib/ext/client_cert_type.c b/lib/ext/client_cert_type.c
index c8079749f624f570965d278609c05c5e5f608f21..5449eae678f8931e5389444b1760527ba77e830a 100644 (file)
--- a/lib/ext/client_cert_type.c
+++ b/lib/ext/client_cert_type.c
@@ -199,7 +199,7 @@ static int _gnutls_client_cert_type_send_params(gnutls_session_t session,
        int ret;
        uint8_t cert_type; // Holds an IANA cert type ID
        uint8_t i = 0, num_cert_types = 0;
-       priority_st* cert_priors;
+       priority_st* cert_priorities;
        gnutls_datum_t tmp_cert_types; // For type conversion
        uint8_t cert_types[GNUTLS_CRT_MAX]; // The list with supported cert types
        const version_entry_st* vers = get_version(session);
@@ -212,7 +212,7 @@ static int _gnutls_client_cert_type_send_params(gnutls_session_t session,
 
        if (!IS_SERVER(session)) {      // Client mode
                // For brevity
-               cert_priors =
+               cert_priorities =
                                &session->internals.priorities->client_ctype;
 
                /* Retrieve client certificate type priorities if any. If no
@@ -220,15 +220,15 @@ static int _gnutls_client_cert_type_send_params(gnutls_session_t session,
                 * initialization values apply. This default is currently set to
                 * x.509 in which case we don't enable this extension.
                 */
-               if (cert_priors->num_priorities > 0) {  // Priorities are explicitly set
+               if (cert_priorities->num_priorities > 0) {      // Priorities are explicitly set
                        /* If the certificate priority is explicitly set to only
                         * X.509 (default) then, according to spec we don't send
                         * this extension. We check this here to avoid further work in
                         * this routine. We also check it below after pruning supported
                         * types.
                         */
-                       if (cert_priors->num_priorities == 1 &&
-                                       cert_priors->priorities[0] == DEFAULT_CERT_TYPE) {
+                       if (cert_priorities->num_priorities == 1 &&
+                                       cert_priorities->priorities[0] == DEFAULT_CERT_TYPE) {
                                _gnutls_handshake_log
                                                ("EXT[%p]: Client certificate type was set to default cert type (%s). "
                                                 "We therefore do not send this extension.\n",
@@ -243,9 +243,9 @@ static int _gnutls_client_cert_type_send_params(gnutls_session_t session,
                         * i.e. have credentials for. Therefore we check this here and
                         * prune our original list.
                         */
-                       for (i = 0; i < cert_priors->num_priorities; i++) {
+                       for (i = 0; i < cert_priorities->num_priorities; i++) {
                                if (_gnutls_session_cert_type_supported
-                                               (session, cert_priors->priorities[i],
+                                               (session, cert_priorities->priorities[i],
                                                 true, GNUTLS_CTYPE_CLIENT) == 0) {
                                        /* Check whether we are allowed to store another cert type
                                         * in our buffer. In other words, prevent a possible buffer
@@ -255,7 +255,7 @@ static int _gnutls_client_cert_type_send_params(gnutls_session_t session,
                                                return gnutls_assert_val(GNUTLS_E_SHORT_MEMORY_BUFFER);
 
                                        // Convert to IANA representation
-                                       cert_type = _gnutls_cert_type2IANA(cert_priors->priorities[i]);
+                                       cert_type = _gnutls_cert_type2IANA(cert_priorities->priorities[i]);
                                        // Add this cert type to our list with supported types
                                        cert_types[num_cert_types] = cert_type;
                                        num_cert_types++;
@@ -263,7 +263,7 @@ static int _gnutls_client_cert_type_send_params(gnutls_session_t session,
                                        _gnutls_handshake_log
                                                        ("EXT[%p]: Client certificate type %s (%d) was queued.\n",
                                                         session,
-                                                        gnutls_certificate_type_get_name(cert_priors->priorities[i]),
+                                                        gnutls_certificate_type_get_name(cert_priorities->priorities[i]),
                                                         cert_type);
                                }
                        }

diff --git a/lib/ext/server_cert_type.c b/lib/ext/server_cert_type.c
index ba4b64c758370da4dcda0ce706fce17973943b79..a00a0376c9c4cad3810370e9e9143a8a3fc91a4a 100644 (file)
--- a/lib/ext/server_cert_type.c
+++ b/lib/ext/server_cert_type.c
@@ -195,7 +195,7 @@ static int _gnutls_server_cert_type_send_params(gnutls_session_t session,
        int ret;
        uint8_t cert_type; // Holds an IANA cert type ID
        uint8_t i = 0, num_cert_types = 0;
-       priority_st* cert_priors;
+       priority_st* cert_priorities;
        gnutls_datum_t tmp_cert_types; // For type conversion
        uint8_t cert_types[GNUTLS_CRT_MAX]; // The list with supported cert types
 
@@ -207,7 +207,7 @@ static int _gnutls_server_cert_type_send_params(gnutls_session_t session,
 
        if (!IS_SERVER(session)) {      // Client mode
                // For brevity
-               cert_priors =
+               cert_priorities =
                                &session->internals.priorities->server_ctype;
 
                /* Retrieve server certificate type priorities if any. If no
@@ -215,15 +215,15 @@ static int _gnutls_server_cert_type_send_params(gnutls_session_t session,
                 * initialization values apply. This default is currently set to
                 * X.509 in which case we don't enable this extension.
                 */
-               if (cert_priors->num_priorities > 0) {  // Priorities are explicitly set
+               if (cert_priorities->num_priorities > 0) {      // Priorities are explicitly set
                        /* If the certificate priority is explicitly set to only
                         * X.509 (default) then, according to spec we don't send
                         * this extension. We check this here to avoid further work in
                         * this routine. We also check it below after pruning supported
                         * types.
                         */
-                       if (cert_priors->num_priorities == 1 &&
-                                       cert_priors->priorities[0] == DEFAULT_CERT_TYPE) {
+                       if (cert_priorities->num_priorities == 1 &&
+                                       cert_priorities->priorities[0] == DEFAULT_CERT_TYPE) {
                                _gnutls_handshake_log
                                                ("EXT[%p]: Server certificate type was set to default cert type (%s). "
                                                 "We therefore do not send this extension.\n",
@@ -243,9 +243,9 @@ static int _gnutls_server_cert_type_send_params(gnutls_session_t session,
                         * added in the ..type_supported() routine without modifying the
                         * structure of the code here.
                         */
-                       for (i = 0; i < cert_priors->num_priorities; i++) {
+                       for (i = 0; i < cert_priorities->num_priorities; i++) {
                                if (_gnutls_session_cert_type_supported
-                                               (session, cert_priors->priorities[i],
+                                               (session, cert_priorities->priorities[i],
                                                 false, GNUTLS_CTYPE_SERVER) == 0) {
                                        /* Check whether we are allowed to store another cert type
                                         * in our buffer. In other words, prevent a possible buffer
@@ -255,7 +255,7 @@ static int _gnutls_server_cert_type_send_params(gnutls_session_t session,
                                                return gnutls_assert_val(GNUTLS_E_SHORT_MEMORY_BUFFER);
 
                                        // Convert to IANA representation
-                                       cert_type = _gnutls_cert_type2IANA(cert_priors->priorities[i]);
+                                       cert_type = _gnutls_cert_type2IANA(cert_priorities->priorities[i]);
                                        // Add this cert type to our list with supported types
                                        cert_types[num_cert_types] = cert_type;
                                        num_cert_types++;
@@ -263,7 +263,7 @@ static int _gnutls_server_cert_type_send_params(gnutls_session_t session,
                                        _gnutls_handshake_log
                                                        ("EXT[%p]: Server certificate type %s (%d) was queued.\n",
                                                         session,
-                                                        gnutls_certificate_type_get_name(cert_priors->priorities[i]),
+                                                        gnutls_certificate_type_get_name(cert_priorities->priorities[i]),
                                                         cert_type);
                                }
                        }