From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 9 Apr 2020 16:15:55 +0000 (+0100)
Subject: [Minor] Add rfc3548 base32 alphabet
X-Git-Tag: 2.6~542
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d56cbb68b103ccca36135a53d611d3e3fed4ec9;p=thirdparty%2Frspamd.git

[Minor] Add rfc3548 base32 alphabet
---

diff --git a/src/libutil/str_util.c b/src/libutil/str_util.c
index 473e68782e..aaa3a0084d 100644
--- a/src/libutil/str_util.c
+++ b/src/libutil/str_util.c
@@ -543,7 +543,9 @@ rspamd_encode_base32_buf (const guchar *in, gsize inlen, gchar *out, gsize outle
 		enum rspamd_base32_type type)
 {
 	static const char b32_default[] = "ybndrfg8ejkmcpqxot1uwisza345h769",
-		b32_bleach[] = "qpzry9x8gf2tvdw0s3jn54khce6mua7l", *b32;
+		b32_bleach[] = "qpzry9x8gf2tvdw0s3jn54khce6mua7l",
+		b32_rfc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567",
+		*b32;
 	gchar *o, *end;
 	gsize i;
 	gint remain = -1, x;
@@ -558,6 +560,9 @@ rspamd_encode_base32_buf (const guchar *in, gsize inlen, gchar *out, gsize outle
 	case RSPAMD_BASE32_BLEACH:
 		b32 = b32_bleach;
 		break;
+	case RSPAMD_BASE32_RFC:
+		b32 = b32_rfc;
+		break;
 	default:
 		g_assert_not_reached ();
 		abort ();
diff --git a/src/libutil/str_util.h b/src/libutil/str_util.h
index e7e5532c38..1d2a668414 100644
--- a/src/libutil/str_util.h
+++ b/src/libutil/str_util.h
@@ -161,7 +161,8 @@ guchar *rspamd_decode_hex (const gchar *in, gsize inlen);
 enum rspamd_base32_type {
 	RSPAMD_BASE32_DEFAULT = 0,
 	RSPAMD_BASE32_ZBASE = 0,
-	RSPAMD_BASE32_BLEACH
+	RSPAMD_BASE32_BLEACH,
+	RSPAMD_BASE32_RFC,
 };
 
 /**