Skip to content

Commit 1e5bb5f

Browse files
feggefegge
committed
Updated tests to pass with new key generation modeling
1 parent 80a29f9 commit 1e5bb5f

File tree

6 files changed

+30
-24
lines changed

6 files changed

+30
-24
lines changed

‎java/ql/test/experimental/library-tests/quantum/BouncyCastle/modes/random_artifacts.expected‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
| AESCBCEncryption.java:22:50:22:52 | Key |
2-
| AESCBCEncryption.java:23:66:23:67 | Nonce |
3-
| AESCBCEncryption.java:41:50:41:52 | Key |
4-
| AESCBCEncryption.java:42:66:42:67 | Nonce |
5-
| AESGCMEncryption.java:18:34:18:36 | Key |
6-
| AESGCMEncryption.java:20:17:20:21 | Nonce |
7-
| AESGCMEncryption.java:37:34:37:36 | Key |
8-
| AESGCMEncryption.java:39:17:39:21 | Nonce |
1+
| AESCBCEncryption.java:22:50:22:52 | Key | AESCBCEncryption.java:60:30:60:32 | RandomNumberGeneration |
2+
| AESCBCEncryption.java:23:66:23:67 | Nonce | AESCBCEncryption.java:62:30:62:31 | RandomNumberGeneration |
3+
| AESCBCEncryption.java:41:50:41:52 | Key | AESCBCEncryption.java:60:30:60:32 | RandomNumberGeneration |
4+
| AESCBCEncryption.java:42:66:42:67 | Nonce | AESCBCEncryption.java:62:30:62:31 | RandomNumberGeneration |
5+
| AESGCMEncryption.java:18:34:18:36 | Key | AESGCMEncryption.java:58:30:58:32 | RandomNumberGeneration |
6+
| AESGCMEncryption.java:20:17:20:21 | Nonce | AESGCMEncryption.java:60:30:60:34 | RandomNumberGeneration |
7+
| AESGCMEncryption.java:37:34:37:36 | Key | AESGCMEncryption.java:58:30:58:32 | RandomNumberGeneration |
8+
| AESGCMEncryption.java:39:17:39:21 | Nonce | AESGCMEncryption.java:60:30:60:34 | RandomNumberGeneration |

‎java/ql/test/experimental/library-tests/quantum/BouncyCastle/modes/random_artifacts.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ import java
22
import experimental.quantum.Language
33

44
from Crypto::ArtifactNode n
5-
where any(SecureRandomnessInstance rng).flowsTo(n.asElement())
6-
select n
5+
where n.getSourceNode() instanceof Crypto::RandomNumberGenerationNode
6+
select n, n.getSourceNode()

‎java/ql/test/experimental/library-tests/quantum/BouncyCastle/signers/key_artifacts.expected‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
| ECDSAP256SignAndVerify.java:57:16:57:49 | Key | Unknown |
2-
| ECDSAP256SignAndVerify.java:80:16:80:49 | Key | Unknown |
3-
| ECDSAP256SignAndVerify.java:103:16:103:49 | Key | Unknown |
4-
| Ed448SignAndVerify.java:21:47:21:80 | Key | Ed448 |
5-
| Ed25519SignAndVerify.java:21:47:21:80 | Key | Ed25519 |
6-
| LMSSignature.java:33:47:33:74 | Key | LMS |
1+
| ECDSAP256SignAndVerify.java:115:27:115:36 | Key | ECDSAP256SignAndVerify.java:57:16:57:49 | Key |
2+
| ECDSAP256SignAndVerify.java:115:27:115:36 | Key | ECDSAP256SignAndVerify.java:80:16:80:49 | Key |
3+
| ECDSAP256SignAndVerify.java:115:27:115:36 | Key | ECDSAP256SignAndVerify.java:103:16:103:49 | Key |
4+
| ECDSAP256SignAndVerify.java:120:30:120:38 | Key | ECDSAP256SignAndVerify.java:57:16:57:49 | Key |
5+
| ECDSAP256SignAndVerify.java:120:30:120:38 | Key | ECDSAP256SignAndVerify.java:80:16:80:49 | Key |
6+
| ECDSAP256SignAndVerify.java:120:30:120:38 | Key | ECDSAP256SignAndVerify.java:103:16:103:49 | Key |
7+
| Ed448SignAndVerify.java:30:31:30:40 | Key | Ed448SignAndVerify.java:21:47:21:80 | Key |
8+
| Ed448SignAndVerify.java:38:34:38:42 | Key | Ed448SignAndVerify.java:21:47:21:80 | Key |
9+
| Ed25519SignAndVerify.java:30:31:30:40 | Key | Ed25519SignAndVerify.java:21:47:21:80 | Key |
10+
| Ed25519SignAndVerify.java:38:34:38:42 | Key | Ed25519SignAndVerify.java:21:47:21:80 | Key |
11+
| LMSSignature.java:43:31:43:40 | Key | LMSSignature.java:33:47:33:74 | Key |
12+
| LMSSignature.java:50:32:50:40 | Key | LMSSignature.java:33:47:33:74 | Key |

‎java/ql/test/experimental/library-tests/quantum/BouncyCastle/signers/key_artifacts.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ import java
22
import experimental.quantum.Language
33

44
from Crypto::KeyArtifactNode n
5-
select n, n.getAKnownAlgorithm()
5+
select n, n.getSourceNode()

‎java/ql/test/experimental/library-tests/quantum/BouncyCastle/signers/key_generation_operations.expected‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
| ECDSAP256SignAndVerify.java:57:16:57:49 | KeyGeneration | ECDSAP256SignAndVerify.java:53:47:53:70 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:57:16:57:49 | Key |
2-
| ECDSAP256SignAndVerify.java:80:16:80:49 | KeyGeneration | ECDSAP256SignAndVerify.java:76:47:76:70 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:80:16:80:49 | Key |
3-
| ECDSAP256SignAndVerify.java:103:16:103:49 | KeyGeneration | ECDSAP256SignAndVerify.java:99:47:99:70 | KeyOperationAlgorithm | ECDSAP256SignAndVerify.java:103:16:103:49 | Key |
4-
| Ed448SignAndVerify.java:21:47:21:80 | KeyGeneration | Ed448SignAndVerify.java:19:54:19:80 | KeyOperationAlgorithm | Ed448SignAndVerify.java:21:47:21:80 | Key |
5-
| Ed25519SignAndVerify.java:21:47:21:80 | KeyGeneration | Ed25519SignAndVerify.java:19:56:19:84 | KeyOperationAlgorithm | Ed25519SignAndVerify.java:21:47:21:80 | Key |
6-
| LMSSignature.java:33:47:33:74 | KeyGeneration | LMSSignature.java:31:46:31:70 | KeyOperationAlgorithm | LMSSignature.java:33:47:33:74 | Key |
1+
| ECDSAP256SignAndVerify.java:57:16:57:49 | KeyGeneration | ECDSAP256SignAndVerify.java:57:16:57:49 | Key |
2+
| ECDSAP256SignAndVerify.java:80:16:80:49 | KeyGeneration | ECDSAP256SignAndVerify.java:80:16:80:49 | Key |
3+
| ECDSAP256SignAndVerify.java:103:16:103:49 | KeyGeneration | ECDSAP256SignAndVerify.java:103:16:103:49 | Key |
4+
| Ed448SignAndVerify.java:21:47:21:80 | KeyGeneration | Ed448SignAndVerify.java:21:47:21:80 | Key |
5+
| Ed25519SignAndVerify.java:21:47:21:80 | KeyGeneration | Ed25519SignAndVerify.java:21:47:21:80 | Key |
6+
| LMSSignature.java:33:47:33:74 | KeyGeneration | LMSSignature.java:33:47:33:74 | Key |

‎java/ql/test/experimental/library-tests/quantum/BouncyCastle/signers/key_generation_operations.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ import java
22
import experimental.quantum.Language
33

44
from Crypto::KeyGenerationOperationNode n
5-
select n, n.getAKnownAlgorithm(), n.getOutputKeyArtifact()
5+
select n, n.getOutputKeyArtifact()

0 commit comments

Comments
 (0)