From 7dbd00381a342b2dac038e46251a7befba704ca9 Mon Sep 17 00:00:00 2001 From: Patrick Okraku Date: Sun, 12 Nov 2023 10:14:05 +0100 Subject: [PATCH] SCRAM: renamed scram_free_session to scram_session_free --- src/irc/core/irc-core.c | 2 +- src/irc/core/sasl.c | 4 ++-- src/irc/core/scram.c | 2 +- src/irc/core/scram.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c index 6f8340e7..136bff85 100644 --- a/src/irc/core/irc-core.c +++ b/src/irc/core/irc-core.c @@ -79,7 +79,7 @@ static void destroy_server_connect(SERVER_CONNECT_REC *conn) g_free_not_null(ircconn->sasl_password); if (ircconn->scram_session != NULL) { - scram_free_session(ircconn->scram_session); + scram_session_free(ircconn->scram_session); } } diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c index 98c781da..e9689b12 100644 --- a/src/irc/core/sasl.c +++ b/src/irc/core/sasl.c @@ -267,7 +267,7 @@ static void scram_authenticate(IRC_SERVER_REC *server, const char *data, const c } else if (ret == SCRAM_SUCCESS) { // Authentication succeeded irc_send_cmd_now(server, "AUTHENTICATE +"); - scram_free_session(conn->scram_session); + scram_session_free(conn->scram_session); conn->scram_session = NULL; } else if (ret == SCRAM_ERROR) { // Authentication failed @@ -278,7 +278,7 @@ static void scram_authenticate(IRC_SERVER_REC *server, const char *data, const c conn->scram_session->error); } - scram_free_session(conn->scram_session); + scram_session_free(conn->scram_session); conn->scram_session = NULL; } } diff --git a/src/irc/core/scram.c b/src/irc/core/scram.c index 060356a0..42812ccc 100644 --- a/src/irc/core/scram.c +++ b/src/irc/core/scram.c @@ -56,7 +56,7 @@ SCRAM_SESSION_REC *scram_session_create(const char *digest, const char *username return session; } -void scram_free_session(SCRAM_SESSION_REC *session) +void scram_session_free(SCRAM_SESSION_REC *session) { if (session == NULL) { return; diff --git a/src/irc/core/scram.h b/src/irc/core/scram.h index 0d4018cf..ee605142 100644 --- a/src/irc/core/scram.h +++ b/src/irc/core/scram.h @@ -20,7 +20,7 @@ typedef enum { SCRAM_ERROR = 0, SCRAM_IN_PROGRESS, SCRAM_SUCCESS } scram_status; SCRAM_SESSION_REC *scram_session_create(const char *digset, const char *username, const char *password); -void scram_free_session(SCRAM_SESSION_REC *session); +void scram_session_free(SCRAM_SESSION_REC *session); scram_status scram_process(SCRAM_SESSION_REC *session, const char *input, char **output, size_t *output_len);