C++: Add a test case involving an array.

geoffw0 · geoffw0 · commit 3641cdcc1fcc · 2021-06-17T12:36:09.000+01:00
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-327/BrokenCryptoAlgorithm.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-327/BrokenCryptoAlgorithm.expected
@@ -1,5 +1,6 @@
 | test2.cpp:49:4:49:24 | call to my_des_implementation | This file makes use of a broken or weak cryptographic algorithm (specified by $@). | test2.cpp:49:4:49:24 | call to my_des_implementation | call to my_des_implementation |
 | test2.cpp:49:4:49:24 | call to my_des_implementation | This file makes use of a broken or weak cryptographic algorithm (specified by $@). | test2.cpp:64:33:64:40 | ALGO_DES | invocation of macro ALGO_DES |
+| test2.cpp:49:4:49:24 | call to my_des_implementation | This file makes use of a broken or weak cryptographic algorithm (specified by $@). | test2.cpp:66:31:66:38 | ALGO_DES | invocation of macro ALGO_DES |
 | test2.cpp:49:4:49:24 | call to my_des_implementation | This file makes use of a broken or weak cryptographic algorithm (specified by $@). | test2.cpp:128:4:128:24 | call to my_des_implementation | call to my_des_implementation |
 | test2.cpp:49:4:49:24 | call to my_des_implementation | This file makes use of a broken or weak cryptographic algorithm (specified by $@). | test2.cpp:148:27:148:29 | DES | access of enum constant DES |
 | test2.cpp:49:4:49:24 | call to my_des_implementation | This file makes use of a broken or weak cryptographic algorithm (specified by $@). | test2.cpp:176:28:176:35 | ALGO_DES | invocation of macro ALGO_DES |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-327/test2.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-327/test2.cpp
@@ -58,12 +58,12 @@ void encrypt_bad(char *data, size_t amount, keytype key, int algo)
 
 void do_encrypts(char *data, size_t amount, keytype key)
 {
-
+	char data2[128];
 
 	encrypt_good(data, amount, key, ALGO_AES); // GOOD
 	encrypt_bad(data, amount, key, ALGO_DES); // BAD
-
-
+	encrypt_good(data2, 128, key, ALGO_AES); // GOOD
+	encrypt_bad(data2, 128, key, ALGO_DES); // BAD
 }
 
 // --- more involved CPP-style example ---

Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,12 @@ void encrypt_bad(char *data, size_t amount, keytype key, int algo)`
`58`	`58`
`59`	`59`	`void do_encrypts(char *data, size_t amount, keytype key)`
`60`	`60`	`{`
`61`		`-`
	`61`	`+ char data2[128];`
`62`	`62`
`63`	`63`	`encrypt_good(data, amount, key, ALGO_AES); // GOOD`
`64`	`64`	`encrypt_bad(data, amount, key, ALGO_DES); // BAD`
`65`		`-`
`66`		`-`
	`65`	`+ encrypt_good(data2, 128, key, ALGO_AES); // GOOD`
	`66`	`+ encrypt_bad(data2, 128, key, ALGO_DES); // BAD`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// --- more involved CPP-style example ---`