commit 1d56cbb: [Minor] Add rfc3548 base32 alphabet

[Vsevolod Stakhov]

Author: Vsevolod Stakhov
Date: 2020-04-09 17:15:55 +0100
URL: https://github.com/rspamd/rspamd/commit/1d56cbb68b103ccca36135a53d611d3e3fed4ec9

[Minor] Add rfc3548 base32 alphabet

---
 src/libutil/str_util.c | 7 ++++++-
 src/libutil/str_util.h | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/libutil/str_util.c b/src/libutil/str_util.c
index 473e68782..aaa3a0084 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 e7e5532c3..1d2a66841 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,
 };
 
 /**