Merge pull request #12106 from MathiasVP/fewer-strings

MathiasVP · web-flow · commit ff29356ae905 · 2023-02-07T11:31:36.000Z
C++: Replace `toUpperCase().matches("...")` with case-insensitive `regexpMatch`
diff --git a/cpp/ql/lib/semmle/code/cpp/security/Encryption.qll b/cpp/ql/lib/semmle/code/cpp/security/Encryption.qll
@@ -64,7 +64,7 @@ predicate isInsecureEncryption(string name) { name.regexpMatch(getInsecureAlgori
  */
 bindingset[name]
 predicate isEncryptionAdditionalEvidence(string name) {
-  name.toUpperCase().matches("%" + ["CRYPT", "CODE", "CODING", "CBC", "KEY", "CIPHER", "MAC"] + "%")
+  name.regexpMatch("(?i).*(crypt|code|coding|cbc|key|cipher|mac).*")
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ predicate isInsecureEncryption(string name) { name.regexpMatch(getInsecureAlgori`
`64`	`64`	`*/`
`65`	`65`	`bindingset[name]`
`66`	`66`	`predicate isEncryptionAdditionalEvidence(string name) {`
`67`		`- name.toUpperCase().matches("%" + ["CRYPT", "CODE", "CODING", "CBC", "KEY", "CIPHER", "MAC"] + "%")`
	`67`	`+ name.regexpMatch("(?i).(crypt\|code\|coding\|cbc\|key\|cipher\|mac).")`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/**`