1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
|
commit a5d61ef4f1b383876e0a78534383f38159471fd6
Author: Ben Collins <bcollins@maclara-llc.com>
Date: Fri Feb 9 09:50:34 2024 -0500
Rework jwt_strcmp() to use less branching
Signed-off-by: Ben Collins <bcollins@maclara-llc.com>
Index: libjwt-1.10.2/libjwt/jwt.c
===================================================================
--- libjwt-1.10.2.orig/libjwt/jwt.c 2024-02-19 22:45:21.051608706 +0100
+++ libjwt-1.10.2/libjwt/jwt.c 2024-02-19 22:48:04.203584376 +0100
@@ -33,16 +33,14 @@
for (i = 0; i < len_max; i++) {
char c1, c2;
- c1 = len1 < i ? str1[i] : '\0';
- c2 = len2 < i ? str2[i] : '\0';
+ c1 = (i < len1) ? str1[i] : 0;
+ c2 = (i < len2) ? str2[i] : 0;
- if (c1 != c2)
- ret = 1;
+ ret |= c1 ^ c2;
}
/* Don't forget to check length */
- if (len1 != len2)
- ret = -1;
+ ret |= len1 ^ len2;
return ret;
}
|