Skip to content

Commit b558e84

Browse files
committed
Update slice query metadata and output tables
1 parent 986c8e1 commit b558e84

14 files changed

+86
-42
lines changed
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/**
2-
* @name Detects known asymmetric algorithms
3-
* @id java/crypto_inventory_slices/known_asymmetric_algorithm
2+
* @name Operations using known asymmetric cipher algorithms (slice)
3+
* @description Outputs operations where the algorithm used is a known asymmetric cipher algorithm.
4+
* @id java/quantum/slices/known-asymmetric-cipher-algorithm
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
811
import experimental.quantum.Language
912

1013
from Crypto::AlgorithmNode a
1114
where Crypto::isKnownAsymmetricAlgorithm(a)
12-
select a, "Instance of asymmetric algorithm " + a.getAlgorithmName()
15+
select a, a.getAlgorithmName()
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/**
2-
* @name Detects known asymmetric cipher algorithms
3-
* @id java/crypto_inventory_slices/known_asymmetric_cipher_algorithm
2+
* @name Known asymmetric cipher algorithms (slice)
3+
* @description Outputs known asymmetric cipher algorithms.
4+
* @id java/quantum/slices/known-asymmetric-cipher-algorithm
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
811
import experimental.quantum.Language
912

1013
from Crypto::KeyOperationAlgorithmNode a
1114
where a.getAlgorithmType() instanceof Crypto::KeyOpAlg::AsymmetricCipherAlgorithm
12-
select a, "Instance of asymmetric cipher algorithm " + a.getAlgorithmName()
15+
select a, a.getAlgorithmName()
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/**
2-
* @name Detects operations where the algorithm applied is a known asymmetric algorithms
3-
* @id java/crypto_inventory_slices/known_asymmetric_operation_algorithm
2+
* @name Operations using known asymmetric algorithms (slice)
3+
* @description Outputs operations where the algorithm used is a known asymmetric algorithm.
4+
* @id java/quantum/slices/known-asymmetric-operation-algorithm
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
811
import experimental.quantum.Language
912

1013
from Crypto::OperationNode op, Crypto::AlgorithmNode a
1114
where a = op.getAKnownAlgorithm() and Crypto::isKnownAsymmetricAlgorithm(a)
12-
select op, "Operation using asymmetric algorithm $@", a, a.getAlgorithmName()
15+
select op, a.getAlgorithmName()
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
/**
2-
* @name Detects known cipher algorithms
3-
* @id java/crypto_inventory_slices/known_cipher_algorithm
2+
* @name Known cipher algorithms (slice)
3+
* @description Outputs known cipher algorithms.
4+
* @id java/quantum/slices/known-cipher-algorithm
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
@@ -12,4 +15,4 @@ from Crypto::KeyOperationAlgorithmNode a
1215
where
1316
a.getAlgorithmType() instanceof Crypto::KeyOpAlg::AsymmetricCipherAlgorithm or
1417
a.getAlgorithmType() instanceof Crypto::KeyOpAlg::SymmetricCipherAlgorithm
15-
select a, "Instance of cipher algorithm " + a.getAlgorithmName()
18+
select a, a.getAlgorithmName()
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
/**
2-
* @name Detects known elliptic curve algorithms
3-
* @id java/crypto_inventory_slices/known_elliptic_curve_algorithm
2+
* @name Known elliptic curve algorithms (slice)
3+
* @description Outputs known elliptic curve algorithms.
4+
* @id java/quantum/slices/known-elliptic-curve-algorithm
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
811
import experimental.quantum.Language
912

1013
from Crypto::EllipticCurveNode a
11-
select a, "Instance of elliptic curve algorithm " + a.getAlgorithmName()
14+
select a, a.getAlgorithmName()
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
/**
2-
* @name Detects algorithms that are known hashing algorithms
3-
* @id java/crypto_inventory_slices/known_hashing_algorithm
2+
* @name Known hashing algorithms (slice)
3+
* @description Outputs known hashing algorithms.
4+
* @id java/quantum/slices/known-hashing-algorithm
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
811
import experimental.quantum.Language
912

1013
from Crypto::HashAlgorithmNode a
11-
select a, "Instance of hashing algorithm " + a.getAlgorithmName()
14+
select a, a.getAlgorithmName()
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
/**
2-
* @name Detects uses of hashing operations (operations exlicitly for hashing only, irrespective of the algorithm used)
3-
* @id java/crypto_inventory_slices/known_hashing_operation
2+
* @name Known hashing operations (slice)
3+
* @description Outputs known hashing operations.
4+
* @id java/quantum/slices/known-hashing-operation
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
811
import experimental.quantum.Language
912

1013
from Crypto::HashOperationNode op
11-
select op, "Known hashing operation"
14+
select op
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/**
2-
* @name Detects operations where the algorithm applied is a known hashing algorithm
3-
* @id java/crypto_inventory_slices/operation_with_known_hashing_algorithm
2+
* @name Operations using known hashing algorithms (slice)
3+
* @description Outputs operations where the algorithm used is a known hashing algorithm.
4+
* @id java/quantum/slices/operation-with-known-hashing-algorithm
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
811
import experimental.quantum.Language
912

1013
from Crypto::OperationNode op, Crypto::HashAlgorithmNode a
1114
where a = op.getAKnownAlgorithm()
12-
select op, "Operation using hashing algorithm $@", a, a.getAlgorithmName()
15+
select op, a.getAlgorithmName()
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
/**
2-
* @name Detects known key derivation algorithms
3-
* @id java/crypto_inventory_slices/known_key_derivation_algorithm
2+
* @name Known key derivation algorithms (slice)
3+
* @description Outputs known key derivation algorithms.
4+
* @id java/quantum/slices/known-key-derivation-algorithm
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
811
import experimental.quantum.Language
912

1013
from Crypto::KeyDerivationAlgorithmNode alg
11-
select alg, "Known key derivation algorithm " + alg.getAlgorithmName()
14+
select alg, alg.getAlgorithmName()
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
/**
2-
* @name Detects uses of key derivation operations (operations exlicitly for key derivation only, irrespective of the algorithm used)
3-
* @id java/crypto_inventory_slices/known_key_derivation_operation
2+
* @name Known key derivation operations (slice)
3+
* @description Outputs known key derivation operations.
4+
* @id java/quantum/slices/known-key-derivation-operation
45
* @kind table
6+
* @tags quantum
7+
* experimental
58
*/
69

710
import java
811
import experimental.quantum.Language
912

1013
from Crypto::KeyDerivationOperationNode op
11-
select op, "Known key derivation operation"
14+
select op

0 commit comments

Comments
 (0)