From a5559e06227d1ae7356ae6ade7a23c4868d92c91 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 3 Nov 2023 14:07:39 +0100 Subject: [PATCH] hexdecoct: implicitly parse URL-safe base64 format, too JSON-I (RFC 7493) suggests to use the URL safe base64 alphabet, rather than the regular one when encoding binary data in JSON strings. We generally uses the regular alphabet though. Let's be tolerant in what we parse however: simply accept both formats when we parse base64. This does nothing about base64 generation though, only about parsing. --- src/basic/hexdecoct.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c index 898ed83f862..ea683eb4273 100644 --- a/src/basic/hexdecoct.c +++ b/src/basic/hexdecoct.c @@ -553,12 +553,12 @@ int unbase64char(char c) { offset += '9' - '0' + 1; - if (c == '+') + if (IN_SET(c, '+', '-')) /* Support both the regular and the URL safe character set (see above) */ return offset; offset++; - if (c == '/') + if (IN_SET(c, '/', '_')) /* ditto */ return offset; return -EINVAL; -- 2.47.3