From 83a8952cf5fa7e1e8147d322d80bdecbe0a1a217 Mon Sep 17 00:00:00 2001
From: C. McEnroe
Date: Tue, 11 Feb 2020 17:40:08 -0500
Subject: Move base64 out of chat.h
---
chat.h | 28 ----------------------------
handle.c | 29 +++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/chat.h b/chat.h
index 735327d..a2da9bf 100644
--- a/chat.h
+++ b/chat.h
@@ -207,34 +207,6 @@ static inline enum Color hash(const char *str) {
return 2 + hash % 74;
}
-#define BASE64_SIZE(len) (1 + ((len) + 2) / 3 * 4)
-static const char Base64[64] = {
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-};
-static inline void base64(char *dst, const byte *src, size_t len) {
- size_t i = 0;
- while (len > 2) {
- dst[i++] = Base64[0x3F & (src[0] >> 2)];
- dst[i++] = Base64[0x3F & (src[0] << 4 | src[1] >> 4)];
- dst[i++] = Base64[0x3F & (src[1] << 2 | src[2] >> 6)];
- dst[i++] = Base64[0x3F & src[2]];
- src += 3;
- len -= 3;
- }
- if (len) {
- dst[i++] = Base64[0x3F & (src[0] >> 2)];
- if (len > 1) {
- dst[i++] = Base64[0x3F & (src[0] << 4 | src[1] >> 4)];
- dst[i++] = Base64[0x3F & (src[1] << 2)];
- } else {
- dst[i++] = Base64[0x3F & (src[0] << 4)];
- dst[i++] = '=';
- }
- dst[i++] = '=';
- }
- dst[i] = '\0';
-}
-
// Defined in libcrypto if missing from libc:
void explicit_bzero(void *b, size_t len);
#ifndef strlcat
diff --git a/handle.c b/handle.c
index f76a181..77f0806 100644
--- a/handle.c
+++ b/handle.c
@@ -118,6 +118,35 @@ static void handleCap(struct Message *msg) {
}
}
+#define BASE64_SIZE(len) (1 + ((len) + 2) / 3 * 4)
+
+static void base64(char *dst, const byte *src, size_t len) {
+ static const char Base64[64] = {
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+ };
+ size_t i = 0;
+ while (len > 2) {
+ dst[i++] = Base64[0x3F & (src[0] >> 2)];
+ dst[i++] = Base64[0x3F & (src[0] << 4 | src[1] >> 4)];
+ dst[i++] = Base64[0x3F & (src[1] << 2 | src[2] >> 6)];
+ dst[i++] = Base64[0x3F & src[2]];
+ src += 3;
+ len -= 3;
+ }
+ if (len) {
+ dst[i++] = Base64[0x3F & (src[0] >> 2)];
+ if (len > 1) {
+ dst[i++] = Base64[0x3F & (src[0] << 4 | src[1] >> 4)];
+ dst[i++] = Base64[0x3F & (src[1] << 2)];
+ } else {
+ dst[i++] = Base64[0x3F & (src[0] << 4)];
+ dst[i++] = '=';
+ }
+ dst[i++] = '=';
+ }
+ dst[i] = '\0';
+}
+
static void handleAuthenticate(struct Message *msg) {
(void)msg;
if (!self.plain) {
--
cgit 1.4.1-2-gfad0