Fixes #507 in LibTomCrypt

Fix a vulnerability in der_decode_utf8_string as specified here: libtom/libtomcrypt#507 Patch manually picked from: libtom/libtomcrypt@25c26a3 [Joakim Bech: Extended commmit message] Acked-by: Joakim Bech <[email protected]> Tested-by: Joakim Bech <[email protected]> (QEMU v7)
OP-TEE · Oct 8, 2019 · 2e3804e · 2e3804e
1 parent 0c76446
commit 2e3804e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/lib/libtomcrypt/src/pk/asn1/der/utf8/der_decode_utf8_string.c b/core/lib/libtomcrypt/src/pk/asn1/der/utf8/der_decode_utf8_string.c
@@ -66,7 +66,7 @@ int der_decode_utf8_string(const unsigned char *in,  unsigned long inlen,
       /* count number of bytes */
       for (z = 0; (tmp & 0x80) && (z <= 4); z++, tmp = (tmp << 1) & 0xFF);
 
-      if (z > 4 || (x + (z - 1) > inlen)) {
+      if (z == 1 || z > 4 || (x + (z - 1) > inlen)) {
          return CRYPT_INVALID_PACKET;
       }