From 25203db4e7b3447dd9bf4f17a8f04e8628c686dc Mon Sep 17 00:00:00 2001
From: Benjamin Rodes <brodes@microsoft.com>
Date: Wed, 27 Sep 2023 12:43:51 -0400
Subject: [PATCH] Removing 'security' tags from all queries.

---
 .../cryptography/example_alerts/UnknownAsymmetricKeyGen.ql  | 3 +--
 .../cryptography/example_alerts/WeakAsymmetricKeyGen.ql     | 3 +--
 .../cryptography/example_alerts/WeakBlockMode.ql            | 3 +--
 .../cryptography/example_alerts/WeakEllipticCurve.ql        | 3 +--
 .../cryptography/example_alerts/WeakEncryption.ql           | 3 +--
 .../experimental/cryptography/example_alerts/WeakHashes.ql  | 3 +--
 .../inventory/new_models/AllAsymmetricAlgorithms.ql         | 3 +--
 .../inventory/new_models/AllCryptoAlgorithms.ql             | 3 +--
 .../inventory/new_models/AsymmetricEncryptionAlgorithms.ql  | 3 +--
 .../inventory/new_models/AsymmetricPaddingAlgorithms.ql     | 3 +--
 .../new_models/AuthenticatedEncryptionAlgorithms.ql         | 3 +--
 .../inventory/new_models/BlockModeAlgorithms.ql             | 3 +--
 .../inventory/new_models/BlockModeKnownIVsOrNonces.ql       | 3 +--
 .../inventory/new_models/BlockModeUnknownIVsOrNonces.ql     | 3 +--
 .../inventory/new_models/EllipticCurveAlgorithmSize.ql      | 3 +--
 .../inventory/new_models/EllipticCurveAlgorithms.ql         | 3 +--
 .../cryptography/inventory/new_models/HashingAlgorithms.ql  | 3 +--
 .../inventory/new_models/KeyExchangeAlgorithms.ql           | 3 +--
 .../inventory/new_models/KnownAsymmetricKeyGeneration.ql    | 3 +--
 .../cryptography/inventory/new_models/SigningAlgorithms.ql  | 3 +--
 .../inventory/new_models/SymmetricEncryptionAlgorithms.ql   | 3 +--
 .../inventory/new_models/SymmetricPaddingAlgorithms.ql      | 3 +--
 .../inventory/new_models/UnknownAsymmetricKeyGeneration.ql  | 3 +--
 .../cryptography/example_alerts/UnknownAsymmetricKeyGen.ql  | 3 +--
 .../cryptography/example_alerts/WeakAsymmetricKeyGen.ql     | 3 +--
 .../cryptography/example_alerts/WeakAsymmetricPadding.ql    | 1 -
 .../cryptography/example_alerts/WeakBlockMode.ql            | 3 +--
 .../cryptography/example_alerts/WeakBlockModeIVorNonce.ql   | 1 -
 .../cryptography/example_alerts/WeakEllipticCurve.ql        | 6 +-----
 .../experimental/cryptography/example_alerts/WeakHashes.ql  | 3 +--
 .../cryptography/example_alerts/WeakKDFAlgorithm.ql         | 1 -
 .../cryptography/example_alerts/WeakKDFIteration.ql         | 1 -
 .../cryptography/example_alerts/WeakKDFKeyLength.ql         | 1 -
 .../experimental/cryptography/example_alerts/WeakKDFMode.ql | 1 -
 .../cryptography/example_alerts/WeakKDFSaltGen.ql           | 1 -
 .../cryptography/example_alerts/WeakKDFSaltSize.ql          | 1 -
 .../cryptography/example_alerts/WeakSymmetricEncryption.ql  | 3 +--
 .../inventory/new_models/AllAsymmetricAlgorithms.ql         | 4 +---
 .../inventory/new_models/AllCryptoAlgorithms.ql             | 3 +--
 .../inventory/new_models/AsymmetricEncryptionAlgorithms.ql  | 3 +--
 .../inventory/new_models/AsymmetricKeyGenOperation.ql       | 3 +--
 .../inventory/new_models/AsymmetricPaddingAlgorithms.ql     | 3 +--
 .../new_models/AuthenticatedEncryptionAlgorithms.ql         | 3 +--
 .../inventory/new_models/BlockModeAlgorithms.ql             | 3 +--
 .../inventory/new_models/BlockModeKnownIVsOrNonces.ql       | 3 +--
 .../inventory/new_models/BlockModeUnknownIVsOrNonces.ql     | 3 +--
 .../inventory/new_models/EllipticCurveAlgorithms.ql         | 3 +--
 .../cryptography/inventory/new_models/HashingAlgorithms.ql  | 3 +--
 .../inventory/new_models/KeyDerivationAlgorithms.ql         | 3 +--
 .../inventory/new_models/KeyExchangeAlgorithms.ql           | 3 +--
 .../cryptography/inventory/new_models/SigningAlgorithms.ql  | 3 +--
 .../inventory/new_models/SymmetricEncryptionAlgorithms.ql   | 3 +--
 .../inventory/new_models/SymmetricPaddingAlgorithms.ql      | 3 +--
 .../inventory/old_models/AllCryptoAlgorithms.ql             | 3 +--
 .../inventory/old_models/BlockModeAlgorithms.ql             | 3 +--
 .../cryptography/inventory/old_models/HashingAlgorithms.ql  | 3 +--
 56 files changed, 48 insertions(+), 108 deletions(-)

diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql b/cpp/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
index 1496cbe39aa..7216fbb7259 100644
--- a/cpp/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
@@ -5,8 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
- *       external/cwe/cwe-326
+ * @tags external/cwe/cwe-326
  */
 import cpp
 
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
index ef029e7cd30..bb7ffc93f94 100644
--- a/cpp/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
@@ -5,8 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
- *     external/cwe/cwe-326
+ * @tags external/cwe/cwe-326
  */
 import cpp
 
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
index 8fd0d4c5180..fe74cac341f 100644
--- a/cpp/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
@@ -5,8 +5,7 @@
 * @kind problem
 * @problem.severity error
 * @precision high
-* @tags security
-*       external/cwe/cwe-327
+* @tags external/cwe/cwe-327
 */
 import cpp
 import experimental.cryptography.Concepts
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
index ca3b48e3724..58f4564f8be 100644
--- a/cpp/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
@@ -5,8 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
- *       external/cwe/cwe-327
+ * @tags external/cwe/cwe-327
  */
 import cpp
 import experimental.cryptography.Concepts
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakEncryption.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakEncryption.ql
index c1854cb17b7..16ddc74480d 100644
--- a/cpp/ql/src/experimental/cryptography/example_alerts/WeakEncryption.ql
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakEncryption.ql
@@ -5,8 +5,7 @@
  * @id cpp/weak-crypto/banned-encryption-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       external/cwe/cwe-327
+ * @tags external/cwe/cwe-327
  */
 
 import cpp
diff --git a/cpp/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql b/cpp/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
index 4df20f84060..688e713fc1e 100644
--- a/cpp/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
+++ b/cpp/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
@@ -5,8 +5,7 @@
  * @id cpp/weak-crypto/banned-hash-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       external/cwe/cwe-327
+ * @tags external/cwe/cwe-327
  */
 
 import cpp
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
index 6528743598f..138664b7665 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/all-asymmetric-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
index a8826837a4b..1fe71b00a58 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/all-cryptographic-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
index 0656efbe91b..29e429af95f 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/all-asymmetric-encryption-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
index 46892f336fd..e12ac07604f 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
@@ -4,8 +4,7 @@
  * @kind problem
  * @id cpp/quantum-readiness/cbom/asymmetric-padding-schemes
  * @problem.severity error
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
index 42758307297..d855e50ea88 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/authenticated-encryption-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
index ffac96cb7ae..36b5d52a7c1 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/block-cipher-mode
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
index 7b2000a5b60..6b91e84edba 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/iv-sources
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
index a28d62da27c..6acf3bb598f 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/unkown-iv-sources
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithmSize.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithmSize.ql
index de4fde6dbec..ad9206b5ba4 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithmSize.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithmSize.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/elliptic-curve-key-length
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
index d52c32dae1f..06aa44cd1bb 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/elliptic-curve-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
index e0d30dd3532..175ba39e138 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/hash-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
index 25daae4105c..7f7ceb17c39 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/key-exchange
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/KnownAsymmetricKeyGeneration.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/KnownAsymmetricKeyGeneration.ql
index 013d66580e9..34fca159fdb 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/KnownAsymmetricKeyGeneration.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/KnownAsymmetricKeyGeneration.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/asymmetric-key-generation
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
index 1ca05d0df16..b052e48a664 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/signing-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
index b4b21f6b4ff..2a4c3f1056a 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/symmetric-encryption-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
index c7372c43d56..9b6c34a8698 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
@@ -4,8 +4,7 @@
  * @kind problem
  * @id cpp/quantum-readiness/cbom/symmetric-padding-schemes
  * @problem.severity error
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/cpp/ql/src/experimental/cryptography/inventory/new_models/UnknownAsymmetricKeyGeneration.ql b/cpp/ql/src/experimental/cryptography/inventory/new_models/UnknownAsymmetricKeyGeneration.ql
index 7de945b76f2..63ab3fdcffb 100644
--- a/cpp/ql/src/experimental/cryptography/inventory/new_models/UnknownAsymmetricKeyGeneration.ql
+++ b/cpp/ql/src/experimental/cryptography/inventory/new_models/UnknownAsymmetricKeyGeneration.ql
@@ -5,8 +5,7 @@
  * @id cpp/quantum-readiness/cbom/unkwon-asymmetric-key-generation
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql b/python/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
index 9d364600c9b..769f80444f1 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/UnknownAsymmetricKeyGen.ql
@@ -5,8 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
- *       external/cwe/cwe-326
+ * @tags external/cwe/cwe-326
  */
 import python
 import experimental.cryptography.Concepts
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
index 11564ff25aa..3bee13153e0 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricKeyGen.ql
@@ -5,8 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
- *     external/cwe/cwe-326
+ * @tags external/cwe/cwe-326
  */
 
 import python
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricPadding.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricPadding.ql
index 205ed90182c..874c17c7e5c 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricPadding.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakAsymmetricPadding.ql
@@ -5,7 +5,6 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
  */
 import python
 import experimental.cryptography.Concepts
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
index 9d9be9a9687..a6a546a2e6b 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakBlockMode.ql
@@ -5,8 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
- *       external/cwe/cwe-327
+ * @tags external/cwe/cwe-327
  */
 
  import python
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakBlockModeIVorNonce.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakBlockModeIVorNonce.ql
index 2b13927bc57..2356169bde7 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakBlockModeIVorNonce.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakBlockModeIVorNonce.ql
@@ -17,7 +17,6 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
  */
 
 
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
index b5d69b9c867..6d07aa179d7 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakEllipticCurve.ql
@@ -5,8 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
- *       external/cwe/cwe-327
+ * @tags external/cwe/cwe-327
  */
 import python
 import experimental.cryptography.Concepts
@@ -22,9 +21,6 @@ where
             not name = ["SECP256R1", "PRIME256V1",//P-256
                   "SECP384R1",        //P-384
                   "SECP521R1",       //P-521
-                  "NUMSP256T1",
-                  "NUMSP384T1",
-                  "NUMSP512T1",
                   "ED25519", "X25519"] and
             msg = "Use of weak curve algorithm " + name + "."
       )
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
index d8936dc06ac..4578f07b8a5 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakHashes.ql
@@ -5,8 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
- *       external/cwe/cwe-327
+ * @tags external/cwe/cwe-327
  */
 
 import python
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFAlgorithm.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFAlgorithm.ql
index 0e8eabce659..9a2bb97c657 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFAlgorithm.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFAlgorithm.ql
@@ -8,7 +8,6 @@
  * @id py/weak-kdf-algorithm
  * @problem.severity error
  * @precision high
- * @tags security
  */
 import python
 import experimental.cryptography.Concepts
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFIteration.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFIteration.ql
index e9abe6fb13c..e2b16ade393 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFIteration.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFIteration.ql
@@ -10,7 +10,6 @@
  * @id py/kdf-low-iteration-count
  * @problem.severity error
  * @precision high
- * @tags security
  */
 import python
 import experimental.cryptography.Concepts
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFKeyLength.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFKeyLength.ql
index c50b55fc57d..7d5cead85db 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFKeyLength.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFKeyLength.ql
@@ -10,7 +10,6 @@
  * @id py/kdf-small-key-size
  * @problem.severity error
  * @precision high
- * @tags security
  */
 import python
 import experimental.cryptography.Concepts
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFMode.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFMode.ql
index 019b596c32a..8ce94c80b0c 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFMode.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFMode.ql
@@ -5,7 +5,6 @@
  * @id py/kdf-weak-mode
  * @problem.severity error
  * @precision high
- * @tags security
  */
 import python
 import experimental.cryptography.Concepts
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltGen.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltGen.ql
index dd3276fd211..fdeb060b5ba 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltGen.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltGen.ql
@@ -5,7 +5,6 @@
  * @id py/kdf-weak-salt-gen
  * @problem.severity error
  * @precision high
- * @tags security
  */
 import python
 import experimental.cryptography.Concepts
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltSize.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltSize.ql
index 247c1d6a7e6..16cf427c1a9 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltSize.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakKDFSaltSize.ql
@@ -8,7 +8,6 @@
  * @id py/kdf-small-salt-size
  * @problem.severity error
  * @precision high
- * @tags security
  */
 
 import python
diff --git a/python/ql/src/experimental/cryptography/example_alerts/WeakSymmetricEncryption.ql b/python/ql/src/experimental/cryptography/example_alerts/WeakSymmetricEncryption.ql
index 05ee8006645..68ffadea931 100644
--- a/python/ql/src/experimental/cryptography/example_alerts/WeakSymmetricEncryption.ql
+++ b/python/ql/src/experimental/cryptography/example_alerts/WeakSymmetricEncryption.ql
@@ -9,8 +9,7 @@
  * @kind problem
  * @problem.severity error
  * @precision high
- * @tags security
- *       external/cwe/cwe-327
+ * @tags external/cwe/cwe-327
  */
 
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
index d88e064314a..8d60f5e9432 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AllAsymmetricAlgorithms.ql
@@ -4,9 +4,7 @@
  * @kind problem
  * @id py/quantum-readiness/cbom/all-asymmetric-algorithms
  * @problem.severity error
- * @precision high
- * @tags security
- *       cbom
+ * @preci cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
index 1095d499b0c..e9daf960bdf 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AllCryptoAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/all-cryptographic-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
index 3aaee1d535f..68335234438 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricEncryptionAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/all-asymmetric-encryption-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricKeyGenOperation.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricKeyGenOperation.ql
index 7e99301ce87..eb5af39da63 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricKeyGenOperation.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricKeyGenOperation.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/asymmetric-key-generation
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
index b027b737f57..1c53fd707c0 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AsymmetricPaddingAlgorithms.ql
@@ -4,8 +4,7 @@
  * @kind problem
  * @id py/quantum-readiness/cbom/asymmetric-padding-schemes
  * @problem.severity error
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
index 633c19ba948..3a154e4ffec 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/AuthenticatedEncryptionAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/authenticated-encryption-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
index d5bfba0c42e..c8c186810ec 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/block-cipher-mode
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
index 8f09015fd17..60209fda6dd 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeKnownIVsOrNonces.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/iv-sources
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
index cf6ace7c2b9..1c8f4c6ca7c 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/BlockModeUnknownIVsOrNonces.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/unkown-iv-sources
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
index 74220fee4bb..313c44d6c8a 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/EllipticCurveAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/elliptic-curve-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
index db177694d23..358ece5b454 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/HashingAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/hash-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/KeyDerivationAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/KeyDerivationAlgorithms.ql
index fd25ad8da79..005fdcf58b7 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/KeyDerivationAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/KeyDerivationAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/key-derivation
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
index ecc86de7184..35696dfc3f1 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/KeyExchangeAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/key-exchange
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
index 9bd59c2956b..48ce3487ac1 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/SigningAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/signing-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
index 15122c49bf2..6d1b0b306b0 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricEncryptionAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/symmetric-encryption-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
index 3746f63cc0b..0d05edaddab 100644
--- a/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/new_models/SymmetricPaddingAlgorithms.ql
@@ -4,8 +4,7 @@
  * @kind problem
  * @id py/quantum-readiness/cbom/symmetric-padding-schemes
  * @problem.severity error
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/old_models/AllCryptoAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/old_models/AllCryptoAlgorithms.ql
index 11a1c5eaa91..ef6b38829ac 100644
--- a/python/ql/src/experimental/cryptography/inventory/old_models/AllCryptoAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/old_models/AllCryptoAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/classic-model/all-cryptographic-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/old_models/BlockModeAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/old_models/BlockModeAlgorithms.ql
index e0bdf7ed2f5..fb5e412cc4d 100644
--- a/python/ql/src/experimental/cryptography/inventory/old_models/BlockModeAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/old_models/BlockModeAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/classic-model/block-cipher-mode
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */
 
diff --git a/python/ql/src/experimental/cryptography/inventory/old_models/HashingAlgorithms.ql b/python/ql/src/experimental/cryptography/inventory/old_models/HashingAlgorithms.ql
index 3a60a535a7e..f06e00f9adf 100644
--- a/python/ql/src/experimental/cryptography/inventory/old_models/HashingAlgorithms.ql
+++ b/python/ql/src/experimental/cryptography/inventory/old_models/HashingAlgorithms.ql
@@ -5,8 +5,7 @@
  * @id py/quantum-readiness/cbom/classic-model/hash-algorithms
  * @problem.severity error
  * @precision high
- * @tags security
- *       cbom
+ * @tags cbom
  *       cryptography
  */