X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fstr%2Fbase32%2Fbase32.c;h=6145da3007657319e5c7da615cf862fe4ef10dcb;hb=c16c021735d53348b6f5fe119e35feea85e6638e;hp=5cdd461bee32a2d4a5841675c3a015dff32f163d;hpb=61aee192bcd814b3cb9073bc0280e4ef5cc45c7d;p=ccan

diff --git a/ccan/str/base32/base32.c b/ccan/str/base32/base32.c
index 5cdd461b..6145da30 100644
--- a/ccan/str/base32/base32.c
+++ b/ccan/str/base32/base32.c
@@ -4,6 +4,8 @@
 #include <ccan/endian/endian.h>
 #include <string.h> /* for memcpy, memset */
 
+const char *base32_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=";
+
 /* RFC 4648:
  *
  * (1) The final quantum of encoding input is an integral multiple of 40
@@ -56,7 +58,7 @@ size_t base32_data_size(const char *str, size_t strlen)
 	size_t max = (strlen + 7) / 8 * 5, padding = 0;
 
 	/* Count trailing padding bytes. */
-	while (strlen && str[strlen-1] == '=' && padding < 6) {
+	while (strlen && str[strlen-1] == base32_chars[32] && padding < 6) {
 		strlen--;
 		padding++;
 	}
@@ -68,24 +70,23 @@ static bool decode_8_chars(const char c[8], beint64_t *res, int *bytes)
 {
 	uint64_t acc = 0;
 	size_t num_pad = 0;
-	for (int i = 0; i < 8; i++) {
-		uint8_t val;
+	int i;
+	for (i = 0; i < 8; i++) {
+		const char *p;
+
 		acc <<= 5;
-		if (c[i] >= 'a' && c[i] <= 'z')
-			val = c[i] - 'a';
-		else if (c[i] >= 'A' && c[i] <= 'Z')
-			val = c[i] - 'A';
-		else if (c[i] >= '2' && c[i] <= '7')
-			val = c[i] - '2' + 26;
-		else if (c[i] == '=') {
-			num_pad++;
-			continue;
-		} else
+		p = memchr(base32_chars, c[i], 32);
+		if (!p) {
+			if (c[i] == base32_chars[32]) {
+				num_pad++;
+				continue;
+			}
 			return false;
+		}
 		/* Can't have padding then non-pad */
 		if (num_pad)
 			return false;
-		acc |= val;
+		acc |= (p - base32_chars);
 	}
 	*res = cpu_to_be64(acc);
 
@@ -120,21 +121,20 @@ static void encode_8_chars(char *dest, const uint8_t *buf, int bytes)
 	beint64_t val = 0;
 	uint64_t res;
 	int bits = bytes * 8;
-	static const char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
 
 	assert(bytes > 0 && bytes <= 5);
 	memcpy((char *)&val + 3, buf, bytes);
 	res = be64_to_cpu(val);
 
 	while (bits > 0) {
-		*dest = enc[(res >> 35) & 0x1F];
+		*dest = base32_chars[(res >> 35) & 0x1F];
 		dest++;
 		res <<= 5;
 		bits -= 5;
 	}
 
 	if (bytes != 5)
-		memset(dest, '=', padlen(bytes));
+		memset(dest, base32_chars[32], padlen(bytes));
 }
 
 bool base32_encode(const void *buf, size_t bufsize, char *dest, size_t destsize)