auth: auth-scram-server - Add auth_scram_ prefixes to functions.

diff --git a/src/auth/auth-scram-server.c b/src/auth/auth-scram-server.c
index 684a58ceba56aff9e9e9034c4fb0cd85a8db6d8b..9a36f23b80e3b103fefc2779c65bcea3db3aaeaa 100644 (file)
--- a/src/auth/auth-scram-server.c
+++ b/src/auth/auth-scram-server.c
@@ -1,4 +1,4 @@
-static const char *scram_unescape_username(const char *in)
+static const char *auth_scram_unescape_username(const char *in)
 {
        string_t *out;
 
@@ -30,9 +30,9 @@ static const char *scram_unescape_username(const char *in)
 }
 
 static bool
-parse_scram_client_first(struct scram_auth_request *server,
-                        const unsigned char *data, size_t size,
-                        const char **error_r)
+auth_scram_parse_client_first(struct scram_auth_request *server,
+                             const unsigned char *data, size_t size,
+                             const char **error_r)
 {
        const char *login_username = NULL;
        const char *data_cstr, *p;
@@ -106,7 +106,7 @@ parse_scram_client_first(struct scram_auth_request *server,
                ;
        else if (authzid[0] == 'a' && authzid[1] == '=') {
                /* Unescape authzid */
-               login_username = scram_unescape_username(authzid + 2);
+               login_username = auth_scram_unescape_username(authzid + 2);
 
                if (login_username == NULL) {
                        *error_r = "authzid escaping is invalid";
@@ -127,7 +127,7 @@ parse_scram_client_first(struct scram_auth_request *server,
         */
        if (username[0] == 'n' && username[1] == '=') {
                /* Unescape username */
-               username = scram_unescape_username(username + 2);
+               username = auth_scram_unescape_username(username + 2);
                if (username == NULL) {
                        *error_r = "Username escaping is invalid";
                        return FALSE;
@@ -160,8 +160,8 @@ parse_scram_client_first(struct scram_auth_request *server,
 }
 
 static const char *
-get_scram_server_first(struct scram_auth_request *server,
-                      int iter, const char *salt)
+auth_scram_get_server_first(struct scram_auth_request *server,
+                           int iter, const char *salt)
 {
        unsigned char snonce[SCRAM_SERVER_NONCE_LEN+1];
        string_t *str;
@@ -199,7 +199,8 @@ get_scram_server_first(struct scram_auth_request *server,
        return str_c(str);
 }
 
-static bool verify_credentials(struct scram_auth_request *server)
+static bool
+auth_scram_server_verify_credentials(struct scram_auth_request *server)
 {
        const struct hash_method *hmethod = server->hash_method;
        struct hmac_context ctx;
@@ -241,9 +242,9 @@ static bool verify_credentials(struct scram_auth_request *server)
 }
 
 static bool
-parse_scram_client_final(struct scram_auth_request *server,
-                        const unsigned char *data, size_t size,
-                        const char **error_r)
+auth_scram_parse_client_final(struct scram_auth_request *server,
+                             const unsigned char *data, size_t size,
+                             const char **error_r)
 {
        const struct hash_method *hmethod = server->hash_method;
        const char **fields, *cbind_input, *nonce_str;
@@ -323,7 +324,8 @@ parse_scram_client_final(struct scram_auth_request *server,
        return TRUE;
 }
 
-static const char *get_scram_server_final(struct scram_auth_request *server)
+static const char *
+auth_scram_get_server_final(struct scram_auth_request *server)
 {
        const struct hash_method *hmethod = server->hash_method;
        struct hmac_context ctx;

diff --git a/src/auth/mech-scram.c b/src/auth/mech-scram.c
index 21970ef6c1483a395d9ff54f30456bfb1503ae35..fc2c7c022564af3d2dd853efe62e091bfd41e48b 100644 (file)
--- a/src/auth/mech-scram.c
+++ b/src/auth/mech-scram.c
@@ -74,7 +74,7 @@ credentials_callback(enum passdb_result result,
                }
 
                request->server_first_message = p_strdup(request->pool,
-                       get_scram_server_first(request, iter_count, salt));
+                       auth_scram_get_server_first(request, iter_count, salt));
 
                auth_request_handler_reply_continue(auth_request,
                                        request->server_first_message,
@@ -100,8 +100,8 @@ void mech_scram_auth_continue(struct auth_request *auth_request,
 
        if (request->client_first_message_bare == NULL) {
                /* Received client-first-message */
-               if (parse_scram_client_first(request, data,
-                                            data_size, &error)) {
+               if (auth_scram_parse_client_first(request, data,
+                                                 data_size, &error)) {
                        auth_request_lookup_credentials(
                                &request->auth_request,
                                request->password_scheme,
@@ -110,14 +110,14 @@ void mech_scram_auth_continue(struct auth_request *auth_request,
                }
        } else {
                /* Received client-final-message */
-               if (parse_scram_client_final(request, data, data_size,
-                                            &error)) {
-                       if (!verify_credentials(request)) {
+               if (auth_scram_parse_client_final(request, data, data_size,
+                                                 &error)) {
+                       if (!auth_scram_server_verify_credentials(request)) {
                                e_info(auth_request->mech_event,
                                       AUTH_LOG_MSG_PASSWORD_MISMATCH);
                        } else {
                                server_final_message =
-                                       get_scram_server_final(request);
+                                       auth_scram_get_server_final(request);
                                len = strlen(server_final_message);
                                auth_request_success(auth_request,
                                                     server_final_message, len);