]> git.ipfire.org Git - thirdparty/wireguard-tools.git/commitdiff
highlighter: insist on 256-bit keys, not 257-bit or 258-bit
authorJason A. Donenfeld <Jason@zx2c4.com>
Sat, 4 Apr 2020 05:14:07 +0000 (23:14 -0600)
committerJason A. Donenfeld <Jason@zx2c4.com>
Sat, 4 Apr 2020 05:14:07 +0000 (23:14 -0600)
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
contrib/highlighter/highlighter.c

index 9f0e53a4e9e3672ddd7035694c7e67a869aaf113..e0d4e04e9abde062eab2b839168f22704a74fa9d 100644 (file)
@@ -62,11 +62,32 @@ static bool is_valid_key(string_span_t s)
        if (s.len != 44 || s.s[43] != '=')
                return false;
 
-       for (size_t i = 0; i < 43; ++i) {
+       for (size_t i = 0; i < 42; ++i) {
                if (!is_decimal(s.s[i]) && !is_alphabet(s.s[i]) &&
                    s.s[i] != '/' && s.s[i] != '+')
                        return false;
        }
+       switch (s.s[42]) {
+       case 'A':
+       case 'E':
+       case 'I':
+       case 'M':
+       case 'Q':
+       case 'U':
+       case 'Y':
+       case 'c':
+       case 'g':
+       case 'k':
+       case 'o':
+       case 's':
+       case 'w':
+       case '4':
+       case '8':
+       case '0':
+               break;
+       default:
+               return false;
+       }
        return true;
 }