Renamed _gnutls_auth_info_set() to _gnutls_auth_info_init().

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

diff --git a/lib/auth.c b/lib/auth.c
index 4bdedda38b64ce952b88bc6f9b6174edab617288..91a67c9afa36c7223c92845a614ba6d1cc2b17d3 100644 (file)
--- a/lib/auth.c
+++ b/lib/auth.c
@@ -380,7 +380,7 @@ void _gnutls_free_auth_info(gnutls_session_t session)
  * info structure to a different type.
  */
 int
-_gnutls_auth_info_set(gnutls_session_t session,
+_gnutls_auth_info_init(gnutls_session_t session,
                      gnutls_credentials_type_t type, int size,
                      int allow_change)
 {

diff --git a/lib/auth.h b/lib/auth.h
index a61acd09ee9d30e2d2092838dab86b22596d4d49..2520efe2ef381b8a9c3f2b087c60ca999b1c1956 100644 (file)
--- a/lib/auth.h
+++ b/lib/auth.h
@@ -57,7 +57,7 @@ const void *_gnutls_get_cred(gnutls_session_t session,
                             gnutls_credentials_type_t type);
 const void *_gnutls_get_kx_cred(gnutls_session_t session,
                                gnutls_kx_algorithm_t algo);
-int _gnutls_auth_info_set(gnutls_session_t session,
+int _gnutls_auth_info_init(gnutls_session_t session,
                          gnutls_credentials_type_t type, int size,
                          int allow_change);
 

diff --git a/lib/auth/anon.c b/lib/auth/anon.c
index 0cfa0efde85dfdff847693ac9caafab58e34e8b0..1edfb54400c0b02c71f0e7f2cd49850033e28d20 100644 (file)
--- a/lib/auth/anon.c
+++ b/lib/auth/anon.c
@@ -74,7 +74,7 @@ gen_anon_server_kx(gnutls_session_t session, gnutls_buffer_st * data)
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_ANON,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_ANON,
                                   sizeof(anon_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;
@@ -113,7 +113,7 @@ proc_anon_server_kx(gnutls_session_t session, uint8_t * data,
 
        /* set auth_info */
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_ANON,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_ANON,
                                   sizeof(anon_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;

diff --git a/lib/auth/anon_ecdh.c b/lib/auth/anon_ecdh.c
index 7b9a7f65bfeae2c6e428d05f7b6fb5a4179c9760..e5265425c1de7cab46029ad82a9a2bf22546881c 100644 (file)
--- a/lib/auth/anon_ecdh.c
+++ b/lib/auth/anon_ecdh.c
@@ -74,7 +74,7 @@ gen_anon_ecdh_server_kx(gnutls_session_t session, gnutls_buffer_st * data)
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_ANON,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_ANON,
                                   sizeof(anon_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;
@@ -120,7 +120,7 @@ proc_anon_ecdh_server_kx(gnutls_session_t session, uint8_t * data,
 
        /* set auth_info */
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_ANON,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_ANON,
                                   sizeof(anon_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;

diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index c722c0c47f2b7b8409661e0e45c53e93f9dc55e5..3c6fe1f4ee41f477d074c5983e71ab0907fdd796 100644 (file)
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -650,7 +650,7 @@ _gnutls_proc_x509_crt(gnutls_session_t session,
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE,
                                   sizeof(cert_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;
@@ -842,7 +842,7 @@ _gnutls_proc_cert_cert_req(gnutls_session_t session, uint8_t * data,
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE,
                                   sizeof(cert_auth_info_st), 0)) < 0) {
                gnutls_assert();
                return ret;

diff --git a/lib/auth/dhe.c b/lib/auth/dhe.c
index cf6c9e53ce68aabdfd20b8a2ed599f0bdd9afc51..9b5ea196ff7e4a5b0b26684eb1a7374737a7a8a0 100644 (file)
--- a/lib/auth/dhe.c
+++ b/lib/auth/dhe.c
@@ -96,7 +96,7 @@ gen_dhe_server_kx(gnutls_session_t session, gnutls_buffer_st * data)
                return GNUTLS_E_INSUFFICIENT_CREDENTIALS;
        }
 
-       if ((ret = _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE,
+       if ((ret = _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE,
                                         sizeof(cert_auth_info_st),
                                         1)) < 0) {
                gnutls_assert();

diff --git a/lib/auth/dhe_psk.c b/lib/auth/dhe_psk.c
index cb0c203a91dace3d879de60c5398bf93f2c56801..cb78359ccbdbfa90f07f44d28b0668b11587ab07 100644 (file)
--- a/lib/auth/dhe_psk.c
+++ b/lib/auth/dhe_psk.c
@@ -199,7 +199,7 @@ gen_dhe_psk_server_kx(gnutls_session_t session, gnutls_buffer_st * data)
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                   sizeof(psk_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;
@@ -237,7 +237,7 @@ gen_ecdhe_psk_server_kx(gnutls_session_t session, gnutls_buffer_st * data)
        gnutls_datum_t hint = {NULL, 0};
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                   sizeof(psk_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;
@@ -290,7 +290,7 @@ proc_dhe_psk_client_kx(gnutls_session_t session, uint8_t * data,
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                   sizeof(psk_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;
@@ -356,7 +356,7 @@ proc_ecdhe_psk_client_kx(gnutls_session_t session, uint8_t * data,
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                   sizeof(psk_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;
@@ -439,7 +439,7 @@ proc_dhe_psk_server_kx(gnutls_session_t session, uint8_t * data,
 
        /* set auth_info */
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                   sizeof(psk_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;
@@ -479,7 +479,7 @@ proc_ecdhe_psk_server_kx(gnutls_session_t session, uint8_t * data,
 
        /* set auth_info */
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                   sizeof(psk_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;

diff --git a/lib/auth/ecdhe.c b/lib/auth/ecdhe.c
index 8b55704b2877a9be78b85b63b024c1734bc40e52..ef9d82271452625776f80d99b37c394862192617 100644 (file)
--- a/lib/auth/ecdhe.c
+++ b/lib/auth/ecdhe.c
@@ -491,7 +491,7 @@ gen_ecdhe_server_kx(gnutls_session_t session, gnutls_buffer_st * data)
                return GNUTLS_E_INSUFFICIENT_CREDENTIALS;
        }
 
-       if ((ret = _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE,
+       if ((ret = _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE,
                                         sizeof(cert_auth_info_st),
                                         1)) < 0) {
                gnutls_assert();

diff --git a/lib/auth/psk.c b/lib/auth/psk.c
index 6968bb8057692c793eba88b3839721ee3008821e..3733de1e620e256283154fa61a8497552b2e828a 100644 (file)
--- a/lib/auth/psk.c
+++ b/lib/auth/psk.c
@@ -204,7 +204,7 @@ _gnutls_proc_psk_client_kx(gnutls_session_t session, uint8_t * data,
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                   sizeof(psk_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;
@@ -315,7 +315,7 @@ _gnutls_proc_psk_server_kx(gnutls_session_t session, uint8_t * data,
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                   sizeof(psk_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;

diff --git a/lib/auth/rsa_psk.c b/lib/auth/rsa_psk.c
index 5a29f91837cbdd8463e6725eb43736475537c60d..644f2e8b293540896f48fb78ce2988bbd5186a21 100644 (file)
--- a/lib/auth/rsa_psk.c
+++ b/lib/auth/rsa_psk.c
@@ -281,7 +281,7 @@ _gnutls_proc_rsa_psk_client_kx(gnutls_session_t session, uint8_t * data,
                return GNUTLS_E_INSUFFICIENT_CREDENTIALS;
        }
 
-       ret = _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+       ret = _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                    sizeof(psk_auth_info_st), 1);
        if (ret < 0) {
                gnutls_assert();

diff --git a/lib/auth/srp_kx.c b/lib/auth/srp_kx.c
index ef0c0e68a9b179be416bf68cf72596474d80501e..890a5dedc3e3556c4b11c6519d66b6e133db4683 100644 (file)
--- a/lib/auth/srp_kx.c
+++ b/lib/auth/srp_kx.c
@@ -137,7 +137,7 @@ _gnutls_gen_srp_server_kx(gnutls_session_t session,
        priv = epriv;
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_SRP,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_SRP,
                                   sizeof(srp_server_auth_info_st),
                                   1)) < 0) {
                gnutls_assert();

diff --git a/lib/ext/pre_shared_key.c b/lib/ext/pre_shared_key.c
index c6bb20c68828d6d31fb759cfc2df026eaaed5e5d..7e61d45cb7d29a66d01c69d5cc7ed0c1ebc9891d 100644 (file)
--- a/lib/ext/pre_shared_key.c
+++ b/lib/ext/pre_shared_key.c
@@ -310,7 +310,7 @@ client_send_params(gnutls_session_t session,
                        user_key.size = tkey.size;
                }
 
-               ret = _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1);
+               ret = _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1);
                if (ret < 0) {
                        gnutls_assert();
                        goto cleanup;
@@ -600,7 +600,7 @@ static int server_recv_params(gnutls_session_t session,
        if (!resuming) {
                assert(psk.identity.size < sizeof(info->username));
 
-               ret = _gnutls_auth_info_set(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1);
+               ret = _gnutls_auth_info_init(session, GNUTLS_CRD_PSK, sizeof(psk_auth_info_st), 1);
                if (ret < 0) {
                        gnutls_assert();
                        goto fail;

diff --git a/lib/session_pack.c b/lib/session_pack.c
index c5801fb32ef53ced9c109e19c6c2c7d111e8aa8b..8d8abd9f3aa3711c4720e880b039f693e059f239 100644 (file)
--- a/lib/session_pack.c
+++ b/lib/session_pack.c
@@ -494,7 +494,7 @@ unpack_certificate_auth_info(gnutls_session_t session,
        /* client and server have the same auth_info here
         */
        ret =
-           _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE,
+           _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE,
                                  sizeof(cert_auth_info_st), 1);
        if (ret < 0) {
                gnutls_assert();
@@ -622,7 +622,7 @@ unpack_srp_auth_info(gnutls_session_t session, gnutls_buffer_st * ps)
        }
 
        ret =
-           _gnutls_auth_info_set(session, GNUTLS_CRD_SRP,
+           _gnutls_auth_info_init(session, GNUTLS_CRD_SRP,
                                  sizeof(srp_server_auth_info_st), 1);
        if (ret < 0) {
                gnutls_assert();
@@ -704,7 +704,7 @@ unpack_anon_auth_info(gnutls_session_t session, gnutls_buffer_st * ps)
        /* client and server have the same auth_info here
         */
        ret =
-           _gnutls_auth_info_set(session, GNUTLS_CRD_ANON,
+           _gnutls_auth_info_init(session, GNUTLS_CRD_ANON,
                                  sizeof(anon_auth_info_st), 1);
        if (ret < 0) {
                gnutls_assert();
@@ -797,7 +797,7 @@ unpack_psk_auth_info(gnutls_session_t session, gnutls_buffer_st * ps)
        unsigned pack_size;
 
        ret =
-           _gnutls_auth_info_set(session, GNUTLS_CRD_PSK,
+           _gnutls_auth_info_init(session, GNUTLS_CRD_PSK,
                                  sizeof(psk_auth_info_st), 1);
        if (ret < 0) {
                gnutls_assert();

diff --git a/lib/tls13/certificate.c b/lib/tls13/certificate.c
index b9a54df3557765ceb1a28b96d25c6f948afd7900..bf8dbda2f7c5617ee2a7d07375f80156a6692314 100644 (file)
--- a/lib/tls13/certificate.c
+++ b/lib/tls13/certificate.c
@@ -375,7 +375,7 @@ parse_cert_list(gnutls_session_t session, uint8_t * data, size_t data_size)
        }
 
        if ((ret =
-            _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE,
+            _gnutls_auth_info_init(session, GNUTLS_CRD_CERTIFICATE,
                                   sizeof(cert_auth_info_st), 1)) < 0) {
                gnutls_assert();
                return ret;