From f778245a86dcec0879794e0f35601965da221b46 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Sun, 19 May 2013 01:20:56 +0200
Subject: Simplify SASL auth string generation code
---
src/common/util.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
(limited to 'src')
diff --git a/src/common/util.c b/src/common/util.c
index 5c09992b..71766f88 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1931,19 +1931,15 @@ get_subdirs (const char *path)
char *
encode_sasl_pass (char *user, char *pass)
{
- int passlen;
+ int authlen;
char *buffer;
char *encoded;
- /* passphrase generation, nicely copy-pasted from the CAP-SASL plugin */
- passlen = strlen (user) * 2 + 2 + strlen (pass);
- buffer = (char*) malloc (passlen + 1);
- strcpy (buffer, user);
- strcpy (buffer + strlen (user) + 1, user);
- strcpy (buffer + strlen (user) * 2 + 2, pass);
- encoded = g_base64_encode ((unsigned char*) buffer, passlen);
-
- free (buffer);
+ /* we can't call strlen() directly on buffer thanks to the atrocious \0 characters it requires */
+ authlen = strlen (user) * 2 + 2 + strlen (pass);
+ buffer = g_strdup_printf ("%s%c%s%c%s", user, '\0', user, '\0', pass);
+ encoded = g_base64_encode ((unsigned char*) buffer, authlen);
+ g_free (buffer);
return encoded;
}
--
cgit 1.4.1