C++: Rearrange the library.

geoffw0 · geoffw0 · commit 40cf29b62521 · 2021-05-13T08:39:37.000+01:00
diff --git a/cpp/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql b/cpp/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql
@@ -18,7 +18,7 @@ abstract class InsecureCryptoSpec extends Locatable {
 }
 
 Function getAnInsecureFunction() {
-  result.getName().regexpMatch(getInsecureAlgorithmRegex()) and
+  isInsecureEncryption(result.getName()) and
   exists(result.getACallToThisFunction())
 }
 
@@ -36,7 +36,7 @@ class InsecureFunctionCall extends InsecureCryptoSpec, FunctionCall {
 }
 
 Macro getAnInsecureMacro() {
-  result.getName().regexpMatch(getInsecureAlgorithmRegex()) and
+  isInsecureEncryption(result.getName()) and
   exists(result.getAnInvocation())
 }
 
diff --git a/cpp/ql/src/semmle/code/cpp/security/Encryption.qll b/cpp/ql/src/semmle/code/cpp/security/Encryption.qll
@@ -14,6 +14,13 @@ string getAnInsecureAlgorithmName() {
     ]
 }
 
+/**
+ * Gets the name of an algorithm that is known to be secure.
+ */
+string getASecureAlgorithmName() {
+  result = ["RSA", "SHA256", "CCM", "GCM", "AES", "Blowfish", "ECIES"]
+}
+
 /**
  * Gets the name of a hash algorithm that is insecure if it is being used for
  * encryption (but it is hard to know when that is happening).
@@ -39,10 +46,11 @@ string getInsecureAlgorithmRegex() {
 }
 
 /**
- * Gets the name of an algorithm that is known to be secure.
+ * Holds if `name` looks like it might be related to operations with an
+ * insecure encyption algorithm.
  */
-string getASecureAlgorithmName() {
-  result = ["RSA", "SHA256", "CCM", "GCM", "AES", "Blowfish", "ECIES"]
+bindingset[name] predicate isInsecureEncryption(string name) {
+  name.regexpMatch(getInsecureAlgorithmRegex())
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ abstract class InsecureCryptoSpec extends Locatable {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`Function getAnInsecureFunction() {`
`21`		`- result.getName().regexpMatch(getInsecureAlgorithmRegex()) and`
	`21`	`+ isInsecureEncryption(result.getName()) and`
`22`	`22`	`exists(result.getACallToThisFunction())`
`23`	`23`	`}`
`24`	`24`
`@@ -36,7 +36,7 @@ class InsecureFunctionCall extends InsecureCryptoSpec, FunctionCall {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`Macro getAnInsecureMacro() {`
`39`		`- result.getName().regexpMatch(getInsecureAlgorithmRegex()) and`
	`39`	`+ isInsecureEncryption(result.getName()) and`
`40`	`40`	`exists(result.getAnInvocation())`
`41`	`41`	`}`
`42`	`42`