diff --git a/go/src/test/files/rules/detection/gocrypto/GoCryptoHKDFExpandTestFile.go b/go/src/test/files/rules/detection/gocrypto/GoCryptoHKDFExpandTestFile.go index 83c0710d..4aeafa22 100644 --- a/go/src/test/files/rules/detection/gocrypto/GoCryptoHKDFExpandTestFile.go +++ b/go/src/test/files/rules/detection/gocrypto/GoCryptoHKDFExpandTestFile.go @@ -14,6 +14,6 @@ func main() { prk := hkdf.Extract(sha256.New, secret, salt) // HKDF Expand step - reader := hkdf.Expand(sha256.New, prk, info, 32) // Noncompliant {{(KeyDerivationFunction) HKDF-SHA256}} + reader := hkdf.Expand(sha256.New, prk, info, 32) // Noncompliant {{(KeyDerivationFunction) HKDF-SHA-256}} _ = reader } diff --git a/go/src/test/files/rules/detection/gocrypto/GoCryptoHKDFTestFile.go b/go/src/test/files/rules/detection/gocrypto/GoCryptoHKDFTestFile.go index 019751db..7eff3cea 100644 --- a/go/src/test/files/rules/detection/gocrypto/GoCryptoHKDFTestFile.go +++ b/go/src/test/files/rules/detection/gocrypto/GoCryptoHKDFTestFile.go @@ -11,6 +11,6 @@ func main() { info := []byte("info") // HKDF Key derivation - reader := hkdf.New(sha256.New, secret, salt, info) // Noncompliant {{(KeyDerivationFunction) HKDF-SHA256}} + reader := hkdf.New(sha256.New, secret, salt, info) // Noncompliant {{(KeyDerivationFunction) HKDF-SHA-256}} _ = reader } diff --git a/go/src/test/files/rules/detection/gocrypto/GoCryptoHMACTestFile.go b/go/src/test/files/rules/detection/gocrypto/GoCryptoHMACTestFile.go index 3f8d4a85..4248abec 100644 --- a/go/src/test/files/rules/detection/gocrypto/GoCryptoHMACTestFile.go +++ b/go/src/test/files/rules/detection/gocrypto/GoCryptoHMACTestFile.go @@ -8,7 +8,7 @@ import ( func main() { key := []byte("secret-key") - h := hmac.New(sha256.New, key) // Noncompliant {{(Mac) HMAC-SHA256}} + h := hmac.New(sha256.New, key) // Noncompliant {{(Mac) HMAC-SHA-256}} h.Write([]byte("hello")) fmt.Printf("%x\n", h.Sum(nil)) } diff --git a/go/src/test/files/rules/detection/gocrypto/GoCryptoPBKDF2StdlibTestFile.go b/go/src/test/files/rules/detection/gocrypto/GoCryptoPBKDF2StdlibTestFile.go index 9d63628e..8f42a556 100644 --- a/go/src/test/files/rules/detection/gocrypto/GoCryptoPBKDF2StdlibTestFile.go +++ b/go/src/test/files/rules/detection/gocrypto/GoCryptoPBKDF2StdlibTestFile.go @@ -9,7 +9,7 @@ func main() { salt := make([]byte, 16) // PBKDF2 Key derivation using stdlib API (Go 1.24+) - key, err := pbkdf2.Key(sha256.New, "password", salt, 600000, 32) // Noncompliant {{(PasswordBasedKeyDerivationFunction) PBKDF2-SHA256}} + key, err := pbkdf2.Key(sha256.New, "password", salt, 600000, 32) // Noncompliant {{(PasswordBasedKeyDerivationFunction) PBKDF2-SHA-256}} if err != nil { panic(err) } diff --git a/go/src/test/files/rules/detection/gocrypto/GoCryptoPBKDF2TestFile.go b/go/src/test/files/rules/detection/gocrypto/GoCryptoPBKDF2TestFile.go index bfc157a0..36d09e26 100644 --- a/go/src/test/files/rules/detection/gocrypto/GoCryptoPBKDF2TestFile.go +++ b/go/src/test/files/rules/detection/gocrypto/GoCryptoPBKDF2TestFile.go @@ -12,6 +12,6 @@ func main() { keyLen := 32 // PBKDF2 Key derivation - key := pbkdf2.Key(password, salt, iterations, keyLen, sha256.New) // Noncompliant {{(PasswordBasedKeyDerivationFunction) PBKDF2-SHA256}} + key := pbkdf2.Key(password, salt, iterations, keyLen, sha256.New) // Noncompliant {{(PasswordBasedKeyDerivationFunction) PBKDF2-SHA-256}} _ = key } diff --git a/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA1TestFile.go b/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA1TestFile.go index 39a3bc81..4d10cfd8 100644 --- a/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA1TestFile.go +++ b/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA1TestFile.go @@ -6,12 +6,12 @@ import ( ) func main() { - h := sha1.New() // Noncompliant {{(MessageDigest) SHA1}} + h := sha1.New() // Noncompliant {{(MessageDigest) SHA-1}} h.Write([]byte("hello")) sum := h.Sum(nil) fmt.Printf("%x\n", sum) // Also test sha1.Sum directly - checksum := sha1.Sum([]byte("data")) // Noncompliant {{(MessageDigest) SHA1}} + checksum := sha1.Sum([]byte("data")) // Noncompliant {{(MessageDigest) SHA-1}} fmt.Printf("%x\n", checksum) } diff --git a/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA256TestFile.go b/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA256TestFile.go index 1a4afa39..38b3318f 100644 --- a/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA256TestFile.go +++ b/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA256TestFile.go @@ -7,22 +7,22 @@ import ( func main() { // Test sha256.New() - SHA-256 - h := sha256.New() // Noncompliant {{(MessageDigest) SHA256}} + h := sha256.New() // Noncompliant {{(MessageDigest) SHA-256}} h.Write([]byte("hello")) sum := h.Sum(nil) fmt.Printf("%x\n", sum) // Test sha256.New224() - SHA-224 - h224 := sha256.New224() // Noncompliant {{(MessageDigest) SHA224}} + h224 := sha256.New224() // Noncompliant {{(MessageDigest) SHA-224}} h224.Write([]byte("hello")) sum224 := h224.Sum(nil) fmt.Printf("%x\n", sum224) // Test sha256.Sum256() - SHA-256 - sum256 := sha256.Sum256([]byte("data")) // Noncompliant {{(MessageDigest) SHA256}} + sum256 := sha256.Sum256([]byte("data")) // Noncompliant {{(MessageDigest) SHA-256}} _ = sum256 // Test sha256.Sum224() - SHA-224 - sum224Direct := sha256.Sum224([]byte("data")) // Noncompliant {{(MessageDigest) SHA224}} + sum224Direct := sha256.Sum224([]byte("data")) // Noncompliant {{(MessageDigest) SHA-224}} _ = sum224Direct } diff --git a/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA3TestFile.go b/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA3TestFile.go index c564de62..5478e575 100644 --- a/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA3TestFile.go +++ b/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA3TestFile.go @@ -6,15 +6,15 @@ import ( func main() { // SHA3-256 hash - h256 := sha3.New256() // Noncompliant {{(MessageDigest) SHA3-256}} + h256 := sha3.New256() // Noncompliant {{(MessageDigest) SHA-3-256}} h256.Write([]byte("test")) _ = h256.Sum(nil) // SHA3-512 hash - h512 := sha3.New512() // Noncompliant {{(MessageDigest) SHA3-512}} + h512 := sha3.New512() // Noncompliant {{(MessageDigest) SHA-3-512}} _ = h512 // Sum256 - direct hash computation - hash := sha3.Sum256([]byte("test")) // Noncompliant {{(MessageDigest) SHA3-256}} + hash := sha3.Sum256([]byte("test")) // Noncompliant {{(MessageDigest) SHA-3-256}} _ = hash } diff --git a/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA512TestFile.go b/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA512TestFile.go index 9382ed80..cbc8fc03 100644 --- a/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA512TestFile.go +++ b/go/src/test/files/rules/detection/gocrypto/GoCryptoSHA512TestFile.go @@ -7,22 +7,22 @@ import ( func main() { // Test sha512.New() - SHA-512 - h := sha512.New() // Noncompliant {{(MessageDigest) SHA512}} + h := sha512.New() // Noncompliant {{(MessageDigest) SHA-512}} h.Write([]byte("hello")) sum := h.Sum(nil) fmt.Printf("%x\n", sum) // Test sha512.New384() - SHA-384 - h384 := sha512.New384() // Noncompliant {{(MessageDigest) SHA384}} + h384 := sha512.New384() // Noncompliant {{(MessageDigest) SHA-384}} h384.Write([]byte("hello")) sum384 := h384.Sum(nil) fmt.Printf("%x\n", sum384) // Test sha512.Sum512() - SHA-512 - sum512 := sha512.Sum512([]byte("data")) // Noncompliant {{(MessageDigest) SHA512}} + sum512 := sha512.Sum512([]byte("data")) // Noncompliant {{(MessageDigest) SHA-512}} _ = sum512 // Test sha512.Sum384() - SHA-384 - sum384Direct := sha512.Sum384([]byte("data")) // Noncompliant {{(MessageDigest) SHA384}} + sum384Direct := sha512.Sum384([]byte("data")) // Noncompliant {{(MessageDigest) SHA-384}} _ = sum384Direct } diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoEd25519SignTest.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoEd25519SignTest.java index 25ce8755..db1e559e 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoEd25519SignTest.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoEd25519SignTest.java @@ -118,7 +118,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // Digest under MessageDigest under Signature INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -213,7 +213,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // Digest under MessageDigest under Signature INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoEd25519VerifyTest.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoEd25519VerifyTest.java index 6ed509f9..6c83be18 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoEd25519VerifyTest.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoEd25519VerifyTest.java @@ -106,7 +106,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // DigestSize under MessageDigest under Signature INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -195,7 +195,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // DigestSize under MessageDigest under Signature INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHKDFExpandTest.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHKDFExpandTest.java index 4967eb9a..9fd397d1 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHKDFExpandTest.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHKDFExpandTest.java @@ -100,7 +100,7 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(3); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // KeyLength under KeyDerivationFunction INode keyLengthNode = keyDerivationFunctionNode.getChildren().get(KeyLength.class); @@ -113,7 +113,7 @@ public void asserts( keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under KeyDerivationFunction INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -162,7 +162,7 @@ public void asserts( keyDerivationFunctionNode1.getChildren().get(MessageDigest.class); assertThat(messageDigestNode1).isNotNull(); assertThat(messageDigestNode1.getChildren()).hasSize(2); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under KeyDerivationFunction INode digestNode1 = messageDigestNode1.getChildren().get(Digest.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHKDFTest.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHKDFTest.java index 854f7444..2a65adb6 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHKDFTest.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHKDFTest.java @@ -109,13 +109,13 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(3); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under KeyDerivationFunction INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHMACTest.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHMACTest.java index e314a7ea..3c4803ad 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHMACTest.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoHMACTest.java @@ -89,7 +89,7 @@ public void asserts( INode macNode = nodes.get(0); assertThat(macNode.getKind()).isEqualTo(Mac.class); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // Oid under Mac INode oidNode = macNode.getChildren().get(Oid.class); @@ -101,7 +101,7 @@ public void asserts( INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest under Mac INode oidNode1 = messageDigestNode.getChildren().get(Oid.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoPBKDF2StdlibTest.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoPBKDF2StdlibTest.java index d9fc2036..3b4addc8 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoPBKDF2StdlibTest.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoPBKDF2StdlibTest.java @@ -124,7 +124,7 @@ public void asserts( INode kdfNode = nodes.get(0); assertThat(kdfNode.getKind()).isEqualTo(PasswordBasedKeyDerivationFunction.class); assertThat(kdfNode.getChildren()).hasSize(4); - assertThat(kdfNode.asString()).isEqualTo("PBKDF2-SHA256"); + assertThat(kdfNode.asString()).isEqualTo("PBKDF2-SHA-256"); // NumberOfIterations under PBKDF2 INode iterationsNode = kdfNode.getChildren().get(NumberOfIterations.class); @@ -145,7 +145,7 @@ public void asserts( INode messageDigestNode = kdfNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoPBKDF2Test.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoPBKDF2Test.java index 3f72b446..8f22e58b 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoPBKDF2Test.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoPBKDF2Test.java @@ -124,7 +124,7 @@ public void asserts( INode kdfNode = nodes.get(0); assertThat(kdfNode.getKind()).isEqualTo(PasswordBasedKeyDerivationFunction.class); assertThat(kdfNode.getChildren()).hasSize(4); - assertThat(kdfNode.asString()).isEqualTo("PBKDF2-SHA256"); + assertThat(kdfNode.asString()).isEqualTo("PBKDF2-SHA-256"); // NumberOfIterations under PBKDF2 INode iterationsNode = kdfNode.getChildren().get(NumberOfIterations.class); @@ -145,7 +145,7 @@ public void asserts( INode messageDigestNode = kdfNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoRSAEncryptOAEPTest.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoRSAEncryptOAEPTest.java index a051d06c..46f19c43 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoRSAEncryptOAEPTest.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoRSAEncryptOAEPTest.java @@ -149,7 +149,7 @@ public void asserts( publicKeyEncryptionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under PublicKeyEncryption INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA1Test.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA1Test.java index 725e28a0..590a50e5 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA1Test.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA1Test.java @@ -78,7 +78,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA1"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-1"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA256Test.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA256Test.java index 44e20e9f..132f3f1f 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA256Test.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA256Test.java @@ -75,7 +75,7 @@ public void asserts( // MessageDigest INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -101,7 +101,7 @@ public void asserts( // MessageDigest INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); - assertThat(messageDigestNode.asString()).isEqualTo("SHA224"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-224"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -127,7 +127,7 @@ public void asserts( // MessageDigest INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -153,7 +153,7 @@ public void asserts( // MessageDigest INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); - assertThat(messageDigestNode.asString()).isEqualTo("SHA224"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-224"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA3Test.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA3Test.java index be1ec8e5..9f623caa 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA3Test.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA3Test.java @@ -73,17 +73,17 @@ public void asserts( case 0 -> { // sha3.New256() assertThat(value0.asString()).isEqualTo("SHA3-256"); - assertThat(digestNode.asString()).isEqualTo("SHA3-256"); + assertThat(digestNode.asString()).isEqualTo("SHA-3-256"); } case 1 -> { // sha3.New512() assertThat(value0.asString()).isEqualTo("SHA3-512"); - assertThat(digestNode.asString()).isEqualTo("SHA3-512"); + assertThat(digestNode.asString()).isEqualTo("SHA-3-512"); } case 2 -> { // sha3.Sum256() assertThat(value0.asString()).isEqualTo("SHA3-256"); - assertThat(digestNode.asString()).isEqualTo("SHA3-256"); + assertThat(digestNode.asString()).isEqualTo("SHA-3-256"); } default -> throw new IllegalStateException("Unexpected findingId: " + findingId); } diff --git a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA512Test.java b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA512Test.java index ee92014f..a7130517 100644 --- a/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA512Test.java +++ b/go/src/test/java/com/ibm/plugin/rules/detection/gocrypto/GoCryptoSHA512Test.java @@ -75,7 +75,7 @@ public void asserts( // MessageDigest INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -101,7 +101,7 @@ public void asserts( // MessageDigest INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); - assertThat(messageDigestNode.asString()).isEqualTo("SHA384"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-384"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -127,7 +127,7 @@ public void asserts( // MessageDigest INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -153,7 +153,7 @@ public void asserts( // MessageDigest INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); - assertThat(messageDigestNode.asString()).isEqualTo("SHA384"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-384"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/files/rules/benchmark/BenchmarkTest00003.java b/java/src/test/files/rules/benchmark/BenchmarkTest00003.java index 2d59bbe2..4b2bd19f 100644 --- a/java/src/test/files/rules/benchmark/BenchmarkTest00003.java +++ b/java/src/test/files/rules/benchmark/BenchmarkTest00003.java @@ -68,7 +68,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) benchmarkprops.load( this.getClass().getClassLoader().getResourceAsStream("benchmark.properties")); String algorithm = benchmarkprops.getProperty("hashAlg1", "SHA512"); - java.security.MessageDigest md = java.security.MessageDigest.getInstance(algorithm); // Noncompliant {{(MessageDigest) SHA512}} + java.security.MessageDigest md = java.security.MessageDigest.getInstance(algorithm); // Noncompliant {{(MessageDigest) SHA-512}} byte[] input = {(byte) '?'}; Object inputParam = param; if (inputParam instanceof String) input = ((String) inputParam).getBytes(); diff --git a/java/src/test/files/rules/benchmark/BenchmarkTest00009.java b/java/src/test/files/rules/benchmark/BenchmarkTest00009.java index 0f0ca07b..748c2c60 100644 --- a/java/src/test/files/rules/benchmark/BenchmarkTest00009.java +++ b/java/src/test/files/rules/benchmark/BenchmarkTest00009.java @@ -65,9 +65,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) try { if (provider.length > 1) { - md = java.security.MessageDigest.getInstance("sha-384", provider[0]); // Noncompliant {{(MessageDigest) SHA384}} + md = java.security.MessageDigest.getInstance("sha-384", provider[0]); // Noncompliant {{(MessageDigest) SHA-384}} } else { - md = java.security.MessageDigest.getInstance("sha-384", "SUN"); // Noncompliant {{(MessageDigest) SHA384}} + md = java.security.MessageDigest.getInstance("sha-384", "SUN"); // Noncompliant {{(MessageDigest) SHA-384}} } byte[] input = {(byte) '?'}; Object inputParam = param; diff --git a/java/src/test/files/rules/detection/bc/aeadcipher/BcChaCha20Poly1305TestFile.java b/java/src/test/files/rules/detection/bc/aeadcipher/BcChaCha20Poly1305TestFile.java index 7277d15c..65d98235 100644 --- a/java/src/test/files/rules/detection/bc/aeadcipher/BcChaCha20Poly1305TestFile.java +++ b/java/src/test/files/rules/detection/bc/aeadcipher/BcChaCha20Poly1305TestFile.java @@ -13,7 +13,7 @@ public static void test1() { secureRandom.nextBytes(keyBytes); // Instantiate ChaCha20Poly1305 with constructor - ChaCha20Poly1305 constructor = new ChaCha20Poly1305(); // Noncompliant {{(AuthenticatedEncryption) ChaCha20Poly1305}} + ChaCha20Poly1305 constructor = new ChaCha20Poly1305(); // Noncompliant {{(AuthenticatedEncryption) ChaCha20-Poly1305}} // Initialize cipher with key and parameters KeyParameter keyParameter = new KeyParameter(keyBytes); diff --git a/java/src/test/files/rules/detection/bc/asymmetricblockcipher/BcBufferedAsymmetricBlockCipherTestFile.java b/java/src/test/files/rules/detection/bc/asymmetricblockcipher/BcBufferedAsymmetricBlockCipherTestFile.java index 0fe9c9f9..da193771 100644 --- a/java/src/test/files/rules/detection/bc/asymmetricblockcipher/BcBufferedAsymmetricBlockCipherTestFile.java +++ b/java/src/test/files/rules/detection/bc/asymmetricblockcipher/BcBufferedAsymmetricBlockCipherTestFile.java @@ -31,7 +31,7 @@ public class BcBufferedAsymmetricBlockCipherTestFile { public static void main(String[] args) { // Initialize your asymmetric block cipher, for example RSA AsymmetricBlockCipher engine = new RSAEngine(); // Noncompliant {{(PublicKeyEncryption) RSA}} - OAEPEncoding cipher = new OAEPEncoding(engine, new SHA3Digest()); // Noncompliant {{(MessageDigest) SHA3}} {{(PublicKeyEncryption) RSA-OAEP}} + OAEPEncoding cipher = new OAEPEncoding(engine, new SHA3Digest()); // Noncompliant {{(MessageDigest) SHA-3}} {{(PublicKeyEncryption) RSA-OAEP}} // Initialize a key for encryption/decryption AsymmetricKeyParameter key = null; // Initialize your asymmetric key (e.g., RSA key) diff --git a/java/src/test/files/rules/detection/bc/asymmetricblockcipher/BcOAEPEncodingTestFile.java b/java/src/test/files/rules/detection/bc/asymmetricblockcipher/BcOAEPEncodingTestFile.java index 667ddda3..6459437a 100644 --- a/java/src/test/files/rules/detection/bc/asymmetricblockcipher/BcOAEPEncodingTestFile.java +++ b/java/src/test/files/rules/detection/bc/asymmetricblockcipher/BcOAEPEncodingTestFile.java @@ -22,7 +22,7 @@ public byte[] encryptCEK1(final RSAPublicKey pub, final SecretKey cek) // TODO: Using intermediate variables should also work // Digest digest = new ShortenedDigest(new SHA3Digest(), 16); // Digest digest = new SHA3Digest(); - OAEPEncoding cipher = new OAEPEncoding(engine, new ShortenedDigest(new SHA3Digest(), 16)); // Noncompliant {{(MessageDigest) SHA3}} {{(PublicKeyEncryption) RSA-OAEP}} + OAEPEncoding cipher = new OAEPEncoding(engine, new ShortenedDigest(new SHA3Digest(), 16)); // Noncompliant {{(MessageDigest) SHA-3}} {{(PublicKeyEncryption) RSA-OAEP}} BigInteger mod = pub.getModulus(); BigInteger exp = pub.getPublicExponent(); @@ -48,7 +48,7 @@ public byte[] encryptCEK2(final RSAPublicKey pub, final SecretKey cek) // This detection should optimally not happen once RSA has been detected as a child finding of OAEPEncoding AsymmetricBlockCipher engine = new RSAEngine(); // Noncompliant {{(PublicKeyEncryption) RSA}} - OAEPEncoding cipher = new OAEPEncoding(engine, new NonMemoableDigest(new SHA3Digest()), new SHA512Digest(), new byte[16]); // Noncompliant {{(MessageDigest) SHA3}} {{(MessageDigest) SHA3}} {{(MessageDigest) SHA512}} {{(PublicKeyEncryption) RSA-OAEP}} + OAEPEncoding cipher = new OAEPEncoding(engine, new NonMemoableDigest(new SHA3Digest()), new SHA512Digest(), new byte[16]); // Noncompliant {{(MessageDigest) SHA-3}} {{(MessageDigest) SHA-3}} {{(MessageDigest) SHA-512}} {{(PublicKeyEncryption) RSA-OAEP}} BigInteger mod = pub.getModulus(); BigInteger exp = pub.getPublicExponent(); diff --git a/java/src/test/files/rules/detection/bc/cipherparameters/BcCramerShoupParametersTestFile.java b/java/src/test/files/rules/detection/bc/cipherparameters/BcCramerShoupParametersTestFile.java index 16d43105..b5a26929 100644 --- a/java/src/test/files/rules/detection/bc/cipherparameters/BcCramerShoupParametersTestFile.java +++ b/java/src/test/files/rules/detection/bc/cipherparameters/BcCramerShoupParametersTestFile.java @@ -13,7 +13,7 @@ public static void testCramerShoupParameters() { // Create a block cipher engine BlockCipher aesEngine = AESEngine.newInstance(); // Noncompliant {{(BlockCipher) AES}} - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} CramerShoupParameters parameters = new CramerShoupParameters( new BigInteger("1"), new BigInteger("1"), new BigInteger("1"), digest); @@ -25,7 +25,7 @@ public static void testCramerShoupPrivateKeyParameters() { // Create a block cipher engine BlockCipher aesEngine = AESEngine.newInstance(); // Noncompliant {{(BlockCipher) AES}} - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} CramerShoupParameters base = new CramerShoupParameters( new BigInteger("1"), new BigInteger("1"), new BigInteger("1"), digest); @@ -46,7 +46,7 @@ public static void testCramerShoupPublicKeyParameters() { // Create a block cipher engine BlockCipher aesEngine = AESEngine.newInstance(); // Noncompliant {{(BlockCipher) AES}} - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} CramerShoupParameters base = new CramerShoupParameters( new BigInteger("1"), new BigInteger("1"), new BigInteger("1"), digest); diff --git a/java/src/test/files/rules/detection/bc/cipherparameters/BcNTRUParametersTestFile.java b/java/src/test/files/rules/detection/bc/cipherparameters/BcNTRUParametersTestFile.java index 2e32360e..03f6cb11 100644 --- a/java/src/test/files/rules/detection/bc/cipherparameters/BcNTRUParametersTestFile.java +++ b/java/src/test/files/rules/detection/bc/cipherparameters/BcNTRUParametersTestFile.java @@ -19,7 +19,7 @@ public static void testNTRUEncryptionKeyParameters() { // Create a block cipher engine BlockCipher aesEngine = AESEngine.newInstance(); // Noncompliant {{(BlockCipher) AES}} - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} NTRUEncryptionParameters base = new NTRUEncryptionParameters( 0, 0, 0, 0, 0, 0, 0, 0, false, new byte[12], false, true, digest); @@ -33,7 +33,7 @@ public static void testNTRUEncryptionPublicKeyParameters() { // Create a block cipher engine BlockCipher aesEngine = AESEngine.newInstance(); // Noncompliant {{(BlockCipher) AES}} - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} NTRUEncryptionParameters base = new NTRUEncryptionParameters( 0, 0, 0, 0, 0, 0, 0, 0, false, new byte[12], false, true, digest); @@ -48,7 +48,7 @@ public static void testNTRUEncryptionPrivateKeyParameters() { // Create a block cipher engine BlockCipher aesEngine = AESEngine.newInstance(); // Noncompliant {{(BlockCipher) AES}} - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} NTRUEncryptionParameters base = new NTRUEncryptionParameters( 0, 0, 0, 0, 0, 0, 0, 0, false, new byte[12], false, true, digest); @@ -67,7 +67,7 @@ public static void testNTRUSigningPrivateKeyParameters1() { // Create a block cipher engine BlockCipher aesEngine = AESEngine.newInstance(); // Noncompliant {{(BlockCipher) AES}} - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} NTRUSigningKeyGenerationParameters base = new NTRUSigningKeyGenerationParameters( 0, 0, 0, 0, 0, 1.0d, 1.0d, 1.0d, false, false, 0, digest); @@ -86,7 +86,7 @@ public static void testNTRUSigningPrivateKeyParameters2() { // Create a block cipher engine BlockCipher aesEngine = AESEngine.newInstance(); // Noncompliant {{(BlockCipher) AES}} - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} NTRUSigningParameters base = new NTRUSigningParameters(0, 0, 0, 0, 1.0d, 1.0d, digest); NTRUSigningPublicKeyParameters publicKey = @@ -104,7 +104,7 @@ public static void testNTRUSigningPublicKeyParameters() { // Create a block cipher engine BlockCipher aesEngine = AESEngine.newInstance(); // Noncompliant {{(BlockCipher) AES}} - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} NTRUSigningParameters base = new NTRUSigningParameters(0, 0, 0, 0, 1.0d, 1.0d, digest); NTRUSigningPublicKeyParameters parameters = diff --git a/java/src/test/files/rules/detection/bc/derivationfunction/BcHKDFBytesGeneratorTestFile.java b/java/src/test/files/rules/detection/bc/derivationfunction/BcHKDFBytesGeneratorTestFile.java index 44160e8a..d1358918 100644 --- a/java/src/test/files/rules/detection/bc/derivationfunction/BcHKDFBytesGeneratorTestFile.java +++ b/java/src/test/files/rules/detection/bc/derivationfunction/BcHKDFBytesGeneratorTestFile.java @@ -9,7 +9,7 @@ public class BcHKDFBytesGeneratorTestFile { public static void test1() { // Define the digest algorithm to be used (e.g., SHA-256) - Digest hash = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest hash = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Input keying material (IKM) - your input key byte[] ikm = Hex.decode("0123456789ABCDEF0123456789ABCDEF"); @@ -25,7 +25,7 @@ public static void test1() { // Create the HKDFBytesGenerator HKDFBytesGenerator hkdfGenerator = - new HKDFBytesGenerator(hash); // Noncompliant {{(KeyDerivationFunction) HKDF-SHA256}} + new HKDFBytesGenerator(hash); // Noncompliant {{(KeyDerivationFunction) HKDF-SHA-256}} // Initialize the generator with parameters hkdfGenerator.init(new HKDFParameters(ikm, salt, info)); @@ -55,7 +55,7 @@ public static void test2() { // Create the HKDFBytesGenerator HKDFBytesGenerator hkdfGenerator = - new HKDFBytesGenerator(new SHA512Digest()); // Noncompliant {{(KeyDerivationFunction) HKDF-SHA512}} {{(MessageDigest) SHA512}} + new HKDFBytesGenerator(new SHA512Digest()); // Noncompliant {{(KeyDerivationFunction) HKDF-SHA-512}} {{(MessageDigest) SHA-512}} // Initialize the generator with parameters hkdfGenerator.init(new HKDFParameters(ikm, salt, info)); diff --git a/java/src/test/files/rules/detection/bc/derivationfunction/BcHandshakeKDFFunctionTestFile.java b/java/src/test/files/rules/detection/bc/derivationfunction/BcHandshakeKDFFunctionTestFile.java index 846ce77d..1d08ee7a 100644 --- a/java/src/test/files/rules/detection/bc/derivationfunction/BcHandshakeKDFFunctionTestFile.java +++ b/java/src/test/files/rules/detection/bc/derivationfunction/BcHandshakeKDFFunctionTestFile.java @@ -40,7 +40,7 @@ public static void main(String[] args) { // Define the HandshakeKDFFunction using EthereumIESEngine int counterStart = 1; // Starting value for the counter - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} EthereumIESEngine.HandshakeKDFFunction kdfFunction = new EthereumIESEngine.HandshakeKDFFunction(counterStart, digest); // Noncompliant@-1 {{(KeyDerivationFunction) KDF2}} diff --git a/java/src/test/files/rules/detection/bc/derivationfunction/BcKDFCounterBytesGeneratorTestFile.java b/java/src/test/files/rules/detection/bc/derivationfunction/BcKDFCounterBytesGeneratorTestFile.java index a9a1d501..88e41f71 100644 --- a/java/src/test/files/rules/detection/bc/derivationfunction/BcKDFCounterBytesGeneratorTestFile.java +++ b/java/src/test/files/rules/detection/bc/derivationfunction/BcKDFCounterBytesGeneratorTestFile.java @@ -10,8 +10,8 @@ public class BcKDFCounterBytesGeneratorTestFile { public static void main(String[] args) { // Define the MAC algorithm to be used (e.g., HMAC with SHA-256) - Digest hash = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} - Mac mac = new HMac(hash); // Noncompliant {{(Mac) HMAC-SHA256}} + Digest hash = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} + Mac mac = new HMac(hash); // Noncompliant {{(Mac) HMAC-SHA-256}} // Input keying material (IKM) - your input key byte[] ikm = Hex.decode("0123456789ABCDEF0123456789ABCDEF"); @@ -24,7 +24,7 @@ public static void main(String[] args) { // Create the KDFCounterBytesGenerator KDFCounterBytesGenerator kdfGenerator = - new KDFCounterBytesGenerator(mac); // Noncompliant {{(KeyDerivationFunction) KDF in Counter Mode}} + new KDFCounterBytesGenerator(mac); // Noncompliant {{(KeyDerivationFunction) SP800-108-CounterKDF}} // Initialize the generator with parameters kdfGenerator.init(new KDFCounterParameters(ikm, fixedInput, 128)); diff --git a/java/src/test/files/rules/detection/bc/derivationfunction/BcMGF1BytesGeneratorTestFile.java b/java/src/test/files/rules/detection/bc/derivationfunction/BcMGF1BytesGeneratorTestFile.java index 24e01311..7e45e0ea 100644 --- a/java/src/test/files/rules/detection/bc/derivationfunction/BcMGF1BytesGeneratorTestFile.java +++ b/java/src/test/files/rules/detection/bc/derivationfunction/BcMGF1BytesGeneratorTestFile.java @@ -6,7 +6,7 @@ public class BcMGF1BytesGeneratorTestFile { public static void main(String[] args) { - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} MGF1BytesGenerator mgfFunction = new MGF1BytesGenerator(digest); // Noncompliant@-1 {{(MaskGenerationFunction) MGF1}} diff --git a/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcECIESKEMExtractorTestFile.java b/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcECIESKEMExtractorTestFile.java index 0c4846a2..3c800f68 100644 --- a/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcECIESKEMExtractorTestFile.java +++ b/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcECIESKEMExtractorTestFile.java @@ -11,10 +11,10 @@ public class BcECIESKEMExtractorTestFile { public static void test() { // Initialize the parameters int keyLen = 2048; // Key length in bits - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} DerivationFunction kdf = new HKDFBytesGenerator(digest); // Your DerivationFunction implementation - // Noncompliant@-1 {{(KeyDerivationFunction) HKDF-SHA256}} + // Noncompliant@-1 {{(KeyDerivationFunction) HKDF-SHA-256}} // Create a RSAKeyParameters object named privParams ECPrivateKeyParameters privParams = new ECPrivateKeyParameters(new BigInteger("1"), null); diff --git a/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcECIESKEMGeneratorTestFile.java b/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcECIESKEMGeneratorTestFile.java index 2d798f14..73b1db99 100644 --- a/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcECIESKEMGeneratorTestFile.java +++ b/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcECIESKEMGeneratorTestFile.java @@ -15,9 +15,9 @@ public static void main(String[] args) { SecureRandom rnd = new SecureRandom(); // Secure random number generator - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} - DerivationFunction kdf = new HKDFBytesGenerator(digest); // Noncompliant {{(KeyDerivationFunction) HKDF-SHA256}} + DerivationFunction kdf = new HKDFBytesGenerator(digest); // Noncompliant {{(KeyDerivationFunction) HKDF-SHA-256}} // Initialize the ECIESKEMGenerator ECIESKEMGenerator kemGenerator = diff --git a/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcRSAKEMExtractorTestFile.java b/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcRSAKEMExtractorTestFile.java index 890e52fe..e31e4136 100644 --- a/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcRSAKEMExtractorTestFile.java +++ b/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcRSAKEMExtractorTestFile.java @@ -11,10 +11,10 @@ public class BcRSAKEMExtractorTestFile { public static void test() { // Initialize the parameters int keyLen = 2048; // Key length in bits - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} DerivationFunction kdf = new HKDFBytesGenerator(digest); // Your DerivationFunction implementation - // Noncompliant@-1 {{(KeyDerivationFunction) HKDF-SHA256}} + // Noncompliant@-1 {{(KeyDerivationFunction) HKDF-SHA-256}} // Create a RSAKeyParameters object named privParams RSAKeyParameters privParams = diff --git a/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcRSAKEMGeneratorTestFile.java b/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcRSAKEMGeneratorTestFile.java index 7302f986..a966b737 100644 --- a/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcRSAKEMGeneratorTestFile.java +++ b/java/src/test/files/rules/detection/bc/encapsulatedsecret/BcRSAKEMGeneratorTestFile.java @@ -13,10 +13,10 @@ public static void main(String[] args) { // Initialize the parameters int keyLen = 2048; // Key length in bits SecureRandom rnd = new SecureRandom(); // Secure random number generator - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} DerivationFunction kdf = new HKDFBytesGenerator(digest); // Your DerivationFunction implementation - // Noncompliant@-1 {{(KeyDerivationFunction) HKDF-SHA256}} + // Noncompliant@-1 {{(KeyDerivationFunction) HKDF-SHA-256}} // Initialize the RSAKEMGenerator RSAKEMGenerator kemGenerator = diff --git a/java/src/test/files/rules/detection/bc/mac/BcHMacTestFile.java b/java/src/test/files/rules/detection/bc/mac/BcHMacTestFile.java index 840fbff5..5f281d98 100644 --- a/java/src/test/files/rules/detection/bc/mac/BcHMacTestFile.java +++ b/java/src/test/files/rules/detection/bc/mac/BcHMacTestFile.java @@ -10,10 +10,10 @@ private static void test1() { byte[] key = "0123456789abcdef".getBytes(StandardCharsets.UTF_8); // Initialize SHA-256 digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Initialize HMac with the digest - HMac hmac = new HMac(digest); // Noncompliant {{(Mac) HMAC-SHA256}} + HMac hmac = new HMac(digest); // Noncompliant {{(Mac) HMAC-SHA-256}} // Compute HMAC hmac.init(new KeyParameter(key)); // Initialize MAC with the same key as the cipher diff --git a/java/src/test/files/rules/detection/bc/other/BcIESEngineTestFile.java b/java/src/test/files/rules/detection/bc/other/BcIESEngineTestFile.java index 99dc9747..78ae1353 100644 --- a/java/src/test/files/rules/detection/bc/other/BcIESEngineTestFile.java +++ b/java/src/test/files/rules/detection/bc/other/BcIESEngineTestFile.java @@ -23,11 +23,11 @@ public static void main(String[] args) throws Exception { // Set up the key derivation function // Here, we use a simple SHA-256 based derivation function - DerivationFunction kdf = new KDF1BytesGenerator(new SHA256Digest()); // Noncompliant {{(KeyDerivationFunction) KDF1}} {{(MessageDigest) SHA256}} + DerivationFunction kdf = new KDF1BytesGenerator(new SHA256Digest()); // Noncompliant {{(KeyDerivationFunction) KDF1}} {{(MessageDigest) SHA-256}} // Set up the MAC (Message Authentication Code) // Here, we use HMAC with SHA-512 - HMac mac = new HMac(new SHA512Digest()); // Noncompliant {{(Mac) HMAC-SHA512}} {{(MessageDigest) SHA512}} + HMac mac = new HMac(new SHA512Digest()); // Noncompliant {{(Mac) HMAC-SHA-512}} {{(MessageDigest) SHA-512}} // Initialize the IESEngine IESEngine engine = new IESEngine(agreement, kdf, mac); // Noncompliant {{(PublicKeyEncryption) IES}} diff --git a/java/src/test/files/rules/detection/bc/other/BcSM2EngineTestFile.java b/java/src/test/files/rules/detection/bc/other/BcSM2EngineTestFile.java index 6406fe5c..49a8989f 100644 --- a/java/src/test/files/rules/detection/bc/other/BcSM2EngineTestFile.java +++ b/java/src/test/files/rules/detection/bc/other/BcSM2EngineTestFile.java @@ -24,7 +24,7 @@ public static void main(String[] args) throws Exception { // Create SM2Engine instance SM2Engine sm2Engine = new SM2Engine(new SHA256Digest(), SM2Engine.Mode.C1C3C2); - // Noncompliant@-1 {{(MessageDigest) SHA256}} {{(PublicKeyEncryption) SM2}} + // Noncompliant@-1 {{(MessageDigest) SHA-256}} {{(PublicKeyEncryption) SM2}} // Encrypt byte[] plaintext = "Hello, SM2!".getBytes(); diff --git a/java/src/test/files/rules/detection/bc/pbe/BcOpenSSLPBEParametersGeneratorTestFile.java b/java/src/test/files/rules/detection/bc/pbe/BcOpenSSLPBEParametersGeneratorTestFile.java index 8025330b..1f365408 100644 --- a/java/src/test/files/rules/detection/bc/pbe/BcOpenSSLPBEParametersGeneratorTestFile.java +++ b/java/src/test/files/rules/detection/bc/pbe/BcOpenSSLPBEParametersGeneratorTestFile.java @@ -38,7 +38,7 @@ public static void test2() { int keyLength = 128; // in bits // Create a digest (SHA-256 in this example) - SHA256Digest sha256Digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + SHA256Digest sha256Digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Create the OpenSSLPBEParametersGenerator with the digest OpenSSLPBEParametersGenerator generator = diff --git a/java/src/test/files/rules/detection/bc/pbe/BcPKCS5S1ParametersGeneratorTestFile.java b/java/src/test/files/rules/detection/bc/pbe/BcPKCS5S1ParametersGeneratorTestFile.java index b70a59aa..b89b408e 100644 --- a/java/src/test/files/rules/detection/bc/pbe/BcPKCS5S1ParametersGeneratorTestFile.java +++ b/java/src/test/files/rules/detection/bc/pbe/BcPKCS5S1ParametersGeneratorTestFile.java @@ -13,7 +13,7 @@ public static void test1() { int keyLength = 128; // in bits // Create a digest (SHA-256 in this example) - SHA256Digest sha256Digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + SHA256Digest sha256Digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Create the PKCS5S1ParametersGenerator with the digest PKCS5S1ParametersGenerator generator = diff --git a/java/src/test/files/rules/detection/bc/signer/BcDSADigestSignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcDSADigestSignerTestFile.java index 5c51b7fb..a10a208c 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcDSADigestSignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcDSADigestSignerTestFile.java @@ -11,7 +11,7 @@ public class BcDSADigestSignerTestFile { public static void test() { // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Initialize DSASginer DSASigner dsa = new DSASigner(); // Noncompliant {{(Signature) DSA}} @@ -19,7 +19,7 @@ public static void test() { // Initialize DSADigestSigner DSADigestSigner signer = new DSADigestSigner(dsa, digest, new StandardDSAEncoding()); - // Noncompliant@-1 {{(Signature) SHA256withDSA}} + // Noncompliant@-1 {{(Signature) SHA-256withDSA}} signer.init(true, new RSAKeyParameters(true, new BigInteger("0"), new BigInteger("1"))); diff --git a/java/src/test/files/rules/detection/bc/signer/BcDigestingMessageSignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcDigestingMessageSignerTestFile.java index aca27a28..429a2529 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcDigestingMessageSignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcDigestingMessageSignerTestFile.java @@ -11,7 +11,7 @@ public class BcDigestingMessageSignerTestFile { public static void test() { // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Create SPHINCS signer with SHAKEDigest SPHINCS256Signer sphincsSigner = diff --git a/java/src/test/files/rules/detection/bc/signer/BcDigestingStateAwareMessageSignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcDigestingStateAwareMessageSignerTestFile.java index 8355a8ab..4fdeb74b 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcDigestingStateAwareMessageSignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcDigestingStateAwareMessageSignerTestFile.java @@ -11,7 +11,7 @@ public class BcDigestingStateAwareMessageSignerTestFile { public static void test() { // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Create SPHINCS signer with SHAKEDigest GMSSStateAwareSigner gmssSigner = new GMSSStateAwareSigner(new SHAKEDigest(256)); // Noncompliant {{(ExtendableOutputFunction) SHAKE256}} diff --git a/java/src/test/files/rules/detection/bc/signer/BcGenericSignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcGenericSignerTestFile.java index 982e318b..bb9e7085 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcGenericSignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcGenericSignerTestFile.java @@ -18,10 +18,10 @@ public static void test() { AsymmetricBlockCipher engine = new RSAEngine(); // Noncompliant {{(PublicKeyEncryption) RSA}} // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Create signer - GenericSigner signer = new GenericSigner(engine, digest); // Noncompliant {{(Signature) SHA256withRSA}} + GenericSigner signer = new GenericSigner(engine, digest); // Noncompliant {{(Signature) SHA-256withRSA}} signer.init(true, new RSAKeyParameters(true, new BigInteger("0"), new BigInteger("1"))); // Data to sign @@ -44,7 +44,7 @@ public static void test2() { AsymmetricBlockCipher engine = new PKCS1Encoding(new ElGamalEngine()); // Noncompliant {{(PublicKeyEncryption) ElGamal}} {{(PublicKeyEncryption) ElGamal}} // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Create signer GenericSigner signer = new GenericSigner(engine, digest); // Noncompliant {{(Signature) ElGamal}} diff --git a/java/src/test/files/rules/detection/bc/signer/BcHashMLDSASignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcHashMLDSASignerTestFile.java index a52362b2..ff53a173 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcHashMLDSASignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcHashMLDSASignerTestFile.java @@ -5,7 +5,7 @@ class BcHashMLDSASignerTestFile { void test(){ - HashMLDSASigner signer = new HashMLDSASigner(); // Noncompliant {{(Signature) SHA512withML-DSA-44}} + HashMLDSASigner signer = new HashMLDSASigner(); // Noncompliant {{(Signature) SHA-512withML-DSA-44}} signer.init(true, new MLDSAKeyParameters(true, MLDSAParameters.ml_dsa_44_with_sha512)); } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/bc/signer/BcISO9796d2PSSSignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcISO9796d2PSSSignerTestFile.java index 2e864a1c..ec184774 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcISO9796d2PSSSignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcISO9796d2PSSSignerTestFile.java @@ -13,7 +13,7 @@ public class BcISO9796d2PSSSignerTestFile { public static void test() { // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Initialize the Engine AsymmetricBlockCipher engine = new RSAEngine(); // Noncompliant {{(PublicKeyEncryption) RSA}} diff --git a/java/src/test/files/rules/detection/bc/signer/BcISO9796d2SignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcISO9796d2SignerTestFile.java index 99c20a23..8d1bb7cd 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcISO9796d2SignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcISO9796d2SignerTestFile.java @@ -13,7 +13,7 @@ public class BcISO9796d2SignerTestFile { public static void test() { // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Initialize the Engine AsymmetricBlockCipher engine = new RSAEngine(); // Noncompliant {{(PublicKeyEncryption) RSA}} diff --git a/java/src/test/files/rules/detection/bc/signer/BcPSSSignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcPSSSignerTestFile.java index ef50a6bb..d44bcf9a 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcPSSSignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcPSSSignerTestFile.java @@ -14,9 +14,9 @@ public static void test() { // Initialize the necessary parameters Digest contentDigest = - new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} Digest mgfDigest = - new SHA512Digest(); // Noncompliant {{(MessageDigest) SHA512}} + new SHA512Digest(); // Noncompliant {{(MessageDigest) SHA-512}} byte[] salt = new byte[20]; // Salt for the PSS padding byte trailer = 0x01; // Trailer field value @@ -25,7 +25,7 @@ public static void test() { // Initialize PSSSigner PSSSigner signer = new PSSSigner(cipher, contentDigest, mgfDigest, salt, trailer); - // Noncompliant@-1 {{(ProbabilisticSignatureScheme) RSASSA-PSS}} + // Noncompliant@-1 {{(ProbabilisticSignatureScheme) RSA-PSS}} signer.init(true, new RSAKeyParameters(true, new BigInteger("0"), new BigInteger("1"))); diff --git a/java/src/test/files/rules/detection/bc/signer/BcRSADigestSignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcRSADigestSignerTestFile.java index 19e7e355..2c69c314 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcRSADigestSignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcRSADigestSignerTestFile.java @@ -10,11 +10,11 @@ public class BcRSADigestSignerTestFile { public static void test() { // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Initialize RSADigestSigner RSADigestSigner signer = new RSADigestSigner(digest, new ASN1ObjectIdentifier("1234")); - // Noncompliant@-1 {{(Signature) SHA256withRSA}} + // Noncompliant@-1 {{(Signature) SHA-256withRSA}} signer.init(true, new RSAKeyParameters(true, new BigInteger("0"), new BigInteger("1"))); diff --git a/java/src/test/files/rules/detection/bc/signer/BcSM2SignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcSM2SignerTestFile.java index 364e7331..a10f6850 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcSM2SignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcSM2SignerTestFile.java @@ -10,7 +10,7 @@ public class BcSM2SignerTestFile { public static void test() { // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Initialize SM2Signer SM2Signer signer = new SM2Signer(new StandardDSAEncoding(), digest); diff --git a/java/src/test/files/rules/detection/bc/signer/BcX931SignerTestFile.java b/java/src/test/files/rules/detection/bc/signer/BcX931SignerTestFile.java index 6d3da1fb..222b013f 100644 --- a/java/src/test/files/rules/detection/bc/signer/BcX931SignerTestFile.java +++ b/java/src/test/files/rules/detection/bc/signer/BcX931SignerTestFile.java @@ -13,7 +13,7 @@ public class BcX931SignerTestFile { public static void test() { // Initialize the Digest - Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + Digest digest = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} // Initialize the Engine AsymmetricBlockCipher engine = new RSAEngine(); // Noncompliant {{(PublicKeyEncryption) RSA}} diff --git a/java/src/test/files/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorGetInstanceTestFile.java b/java/src/test/files/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorGetInstanceTestFile.java index 082b866d..57513d2f 100644 --- a/java/src/test/files/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorGetInstanceTestFile.java +++ b/java/src/test/files/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorGetInstanceTestFile.java @@ -6,6 +6,6 @@ public class JcaAlgorithmParameterGeneratorGetInstanceTestFile { public void test() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { - AlgorithmParameterGenerator paramGen = AlgorithmParameterGenerator.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) DH-3072}} + AlgorithmParameterGenerator paramGen = AlgorithmParameterGenerator.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) FFDH-3072}} } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorInitTestFile.java b/java/src/test/files/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorInitTestFile.java index 07861a4c..9bb39ad0 100644 --- a/java/src/test/files/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorInitTestFile.java +++ b/java/src/test/files/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorInitTestFile.java @@ -5,7 +5,7 @@ public class JcaAlgorithmParameterGeneratorInitTestFile { void test() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { - AlgorithmParameterGenerator paramGen = AlgorithmParameterGenerator.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) DH-2048}} + AlgorithmParameterGenerator paramGen = AlgorithmParameterGenerator.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) FFDH-2048}} paramGen.init(2048); } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/algorithmspec/JcaDHGenParameterSpecTestFile.java b/java/src/test/files/rules/detection/jca/algorithmspec/JcaDHGenParameterSpecTestFile.java index c3a16d8e..8485e8ec 100644 --- a/java/src/test/files/rules/detection/jca/algorithmspec/JcaDHGenParameterSpecTestFile.java +++ b/java/src/test/files/rules/detection/jca/algorithmspec/JcaDHGenParameterSpecTestFile.java @@ -6,7 +6,7 @@ public class JcaDHGenParameterSpecTestFile { public void test() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { - AlgorithmParameterGenerator paramGen = AlgorithmParameterGenerator.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) DH-2048}} + AlgorithmParameterGenerator paramGen = AlgorithmParameterGenerator.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) FFDH-2048}} DHGenParameterSpec genParameterSpec = new DHGenParameterSpec(2048, 128); paramGen.init(genParameterSpec); } diff --git a/java/src/test/files/rules/detection/jca/digest/JcaMessageDigestGetInstance2TestFile.java b/java/src/test/files/rules/detection/jca/digest/JcaMessageDigestGetInstance2TestFile.java index 0ffc851d..390a76ac 100644 --- a/java/src/test/files/rules/detection/jca/digest/JcaMessageDigestGetInstance2TestFile.java +++ b/java/src/test/files/rules/detection/jca/digest/JcaMessageDigestGetInstance2TestFile.java @@ -6,9 +6,9 @@ void test() { java.security.Provider[] provider = java.security.Security.getProviders(); java.security.MessageDigest md; if (provider.length > 1) { - md = java.security.MessageDigest.getInstance("sha-384", provider[0]); // Noncompliant {{(MessageDigest) SHA384}} + md = java.security.MessageDigest.getInstance("sha-384", provider[0]); // Noncompliant {{(MessageDigest) SHA-384}} } else { - md = java.security.MessageDigest.getInstance("sha-384", "SUN"); // Noncompliant {{(MessageDigest) SHA384}} + md = java.security.MessageDigest.getInstance("sha-384", "SUN"); // Noncompliant {{(MessageDigest) SHA-384}} } } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/digest/JcaMessageDigestGetInstanceTestFile.java b/java/src/test/files/rules/detection/jca/digest/JcaMessageDigestGetInstanceTestFile.java index 2a654564..7c70fbec 100644 --- a/java/src/test/files/rules/detection/jca/digest/JcaMessageDigestGetInstanceTestFile.java +++ b/java/src/test/files/rules/detection/jca/digest/JcaMessageDigestGetInstanceTestFile.java @@ -4,7 +4,7 @@ public class JcaMessageDigestGetInstanceTestFile { public void test() throws NoSuchAlgorithmException { - MessageDigest digest = MessageDigest.getInstance("SHA-512/224"); // Noncompliant {{(MessageDigest) SHA512/224}} + MessageDigest digest = MessageDigest.getInstance("SHA-512/224"); // Noncompliant {{(MessageDigest) SHA-512/224}} } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretAlgorithmTestFile.java b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretAlgorithmTestFile.java index 919492f5..3bc066ae 100644 --- a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretAlgorithmTestFile.java +++ b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretAlgorithmTestFile.java @@ -5,7 +5,7 @@ public class JcaKeyAgreementGenerateSecretAlgorithmTestFile { public void test() throws NoSuchAlgorithmException, InvalidKeyException { - KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) DH-3072}} + KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) FFDH-3072}} keyAgreement.generateSecret("AES"); } diff --git a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretKeySizeTestFile.java b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretKeySizeTestFile.java index 168815dd..908e585d 100644 --- a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretKeySizeTestFile.java +++ b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretKeySizeTestFile.java @@ -5,7 +5,7 @@ public class JcaKeyAgreementGenerateSecretKeySizeTestFile { public void test() throws NoSuchAlgorithmException, ShortBufferException { - KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) DH-2048}} + KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) FFDH-2048}} keyAgreement.generateSecret(new byte[256], 0); } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretTestFile.java b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretTestFile.java index 52431527..a54ab8ae 100644 --- a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretTestFile.java +++ b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretTestFile.java @@ -6,7 +6,7 @@ public class JcaKeyAgreementGenerateSecretTestFile { public void test() throws NoSuchAlgorithmException, InvalidKeyException { - KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) DH-3072}} + KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) FFDH-3072}} SecretKey key = keyAgreement.generateSecret(); } diff --git a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGetInstanceTestFile.java b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGetInstanceTestFile.java index 3bc699a0..75ea4895 100644 --- a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGetInstanceTestFile.java +++ b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementGetInstanceTestFile.java @@ -4,7 +4,7 @@ public class JcaKeyAgreementGetInstanceTestFile { public void test() throws NoSuchAlgorithmException { - KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) DH-3072}} + KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) FFDH-3072}} } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementInitTestFile.java b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementInitTestFile.java index 47920035..6909fa12 100644 --- a/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementInitTestFile.java +++ b/java/src/test/files/rules/detection/jca/keyagreement/JcaKeyAgreementInitTestFile.java @@ -6,7 +6,7 @@ public class JcaKeyAgreementInitTestFile { public void test() throws NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException, InvalidAlgorithmParameterException { - KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) DH-512}} + KeyAgreement keyAgreement = KeyAgreement.getInstance("DiffieHellman"); // Noncompliant {{(PublicKeyEncryption) FFDH-512}} keyAgreement.init(null, new DHParameterSpec( new BigInteger("9708102954833850385429735875923118698675232975312319039401641572679349867933157991841270959296437077051734595809836247517279020686405390233910225592049587"), new BigInteger("2"))); diff --git a/java/src/test/files/rules/detection/jca/mac/JcaMacGetInstanceTestFile.java b/java/src/test/files/rules/detection/jca/mac/JcaMacGetInstanceTestFile.java index 146cb8fd..945e3864 100644 --- a/java/src/test/files/rules/detection/jca/mac/JcaMacGetInstanceTestFile.java +++ b/java/src/test/files/rules/detection/jca/mac/JcaMacGetInstanceTestFile.java @@ -3,6 +3,6 @@ public class JcaMacGetInstanceTestFile { public void test() throws NoSuchAlgorithmException { - Mac mac = Mac.getInstance("HmacSHA3-384"); // Noncompliant {{(Mac) HMAC-SHA3-384}} + Mac mac = Mac.getInstance("HmacSHA3-384"); // Noncompliant {{(Mac) HMAC-SHA-3-384}} } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/signature/JcaSignatureActionSignTestFile.java b/java/src/test/files/rules/detection/jca/signature/JcaSignatureActionSignTestFile.java index ca889ed4..5e11b0fc 100644 --- a/java/src/test/files/rules/detection/jca/signature/JcaSignatureActionSignTestFile.java +++ b/java/src/test/files/rules/detection/jca/signature/JcaSignatureActionSignTestFile.java @@ -4,7 +4,7 @@ public class JcaSignatureActionSignTestFile { public void test() throws NoSuchAlgorithmException, SignatureException { - Signature signature = Signature.getInstance("SHA384withDSA"); // Noncompliant {{(Signature) SHA384withDSA}} + Signature signature = Signature.getInstance("SHA384withDSA"); // Noncompliant {{(Signature) SHA-384withDSA}} signature.sign(); } diff --git a/java/src/test/files/rules/detection/jca/signature/JcaSignatureActionVerifyTestFile.java b/java/src/test/files/rules/detection/jca/signature/JcaSignatureActionVerifyTestFile.java index 5b9b459c..a8f6db05 100644 --- a/java/src/test/files/rules/detection/jca/signature/JcaSignatureActionVerifyTestFile.java +++ b/java/src/test/files/rules/detection/jca/signature/JcaSignatureActionVerifyTestFile.java @@ -5,7 +5,7 @@ public class JcaSignatureActionVerifyTestFile { public void test() throws NoSuchAlgorithmException, SignatureException { - Signature signature = Signature.getInstance("SHA384withDSA"); // Noncompliant {{(Signature) SHA384withDSA}} + Signature signature = Signature.getInstance("SHA384withDSA"); // Noncompliant {{(Signature) SHA-384withDSA}} signature.verify(new byte[10]); } diff --git a/java/src/test/files/rules/detection/jca/signature/JcaSignatureGetInstanceTestFile.java b/java/src/test/files/rules/detection/jca/signature/JcaSignatureGetInstanceTestFile.java index 7988fca8..c6e22743 100644 --- a/java/src/test/files/rules/detection/jca/signature/JcaSignatureGetInstanceTestFile.java +++ b/java/src/test/files/rules/detection/jca/signature/JcaSignatureGetInstanceTestFile.java @@ -4,6 +4,6 @@ public class JcaSignatureGetInstanceTestFile { public void test() throws NoSuchAlgorithmException { - Signature signature = Signature.getInstance("SHA384withDSA"); // Noncompliant {{(Signature) SHA384withDSA}} + Signature signature = Signature.getInstance("SHA384withDSA"); // Noncompliant {{(Signature) SHA-384withDSA}} } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameter2TestFile.java b/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameter2TestFile.java index e14a2a03..0afcbf57 100644 --- a/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameter2TestFile.java +++ b/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameter2TestFile.java @@ -7,7 +7,7 @@ public class JcaSignatureSetParameter2TestFile { public void test() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { - Signature signature = Signature.getInstance("RSASSA-PSS"); // Noncompliant {{(ProbabilisticSignatureScheme) RSASSA-PSS}} + Signature signature = Signature.getInstance("RSASSA-PSS"); // Noncompliant {{(ProbabilisticSignatureScheme) RSA-PSS}} signature.setParameter(new PSSParameterSpec("SHA3-256", "MGF1", new MGF1ParameterSpec("SHA-256"), 20, 1)); } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameter3TestFile.java b/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameter3TestFile.java index 2be4d394..d3de41f7 100644 --- a/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameter3TestFile.java +++ b/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameter3TestFile.java @@ -7,7 +7,7 @@ public class JcaSignatureSetParameter3TestFile { public void test() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { - Signature signature = Signature.getInstance("RSASSA-PSS"); // Noncompliant {{(ProbabilisticSignatureScheme) RSASSA-PSS}} + Signature signature = Signature.getInstance("RSASSA-PSS"); // Noncompliant {{(ProbabilisticSignatureScheme) RSA-PSS}} signature.setParameter(new PSSParameterSpec("SHA3-256", "MGF1", MGF1ParameterSpec.SHA1, 20, 1)); } } \ No newline at end of file diff --git a/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameterTestFile.java b/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameterTestFile.java index 9e796a8a..eec49848 100644 --- a/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameterTestFile.java +++ b/java/src/test/files/rules/detection/jca/signature/JcaSignatureSetParameterTestFile.java @@ -6,7 +6,7 @@ public class JcaSignatureSetParameterTestFile { public void test() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { - Signature signature = Signature.getInstance("RSASSA-PSS"); // Noncompliant {{(ProbabilisticSignatureScheme) RSASSA-PSS}} + Signature signature = Signature.getInstance("RSASSA-PSS"); // Noncompliant {{(ProbabilisticSignatureScheme) RSA-PSS}} signature.setParameter(new PSSParameterSpec(20)); } } \ No newline at end of file diff --git a/java/src/test/files/rules/issues/DuplicateParameterFindingsTestFile.java b/java/src/test/files/rules/issues/DuplicateParameterFindingsTestFile.java index 89f835dc..5623361f 100644 --- a/java/src/test/files/rules/issues/DuplicateParameterFindingsTestFile.java +++ b/java/src/test/files/rules/issues/DuplicateParameterFindingsTestFile.java @@ -14,7 +14,7 @@ public class DuplicateParameterFindingsTestFile { public byte[] encryptCEK(final RSAPublicKey pub, final SecretKey cek) throws RuntimeException { AsymmetricBlockCipher engine = new RSAEngine(); // Noncompliant {{(PublicKeyEncryption) RSA}} - OAEPEncoding cipher = new OAEPEncoding(engine, new SHA3Digest(), new SHA512Digest(), new byte[16]); // Noncompliant {{(MessageDigest) SHA3}} {{(MessageDigest) SHA512}} {{(PublicKeyEncryption) RSA-OAEP}} + OAEPEncoding cipher = new OAEPEncoding(engine, new SHA3Digest(), new SHA512Digest(), new byte[16]); // Noncompliant {{(MessageDigest) SHA-3}} {{(MessageDigest) SHA-512}} {{(PublicKeyEncryption) RSA-OAEP}} return cipher.processBlock(cek.getEncoded(), 0, keyBytes.length); } } diff --git a/java/src/test/files/rules/issues/Issue214TestFile.java b/java/src/test/files/rules/issues/Issue214TestFile.java index 4d027893..6be2fd52 100644 --- a/java/src/test/files/rules/issues/Issue214TestFile.java +++ b/java/src/test/files/rules/issues/Issue214TestFile.java @@ -4,6 +4,6 @@ public class JcaSignatureGetInstanceTestFile { public void test() throws NoSuchAlgorithmException { - Signature signature = Signature.getInstance("SHA1withRSA"); // Noncompliant {{(Signature) SHA1withRSA}} + Signature signature = Signature.getInstance("SHA1withRSA"); // Noncompliant {{(Signature) SHA-1withRSA}} } } \ No newline at end of file diff --git a/java/src/test/files/rules/issues/Issue297Sha256TestFile.java b/java/src/test/files/rules/issues/Issue297Sha256TestFile.java index e2d24de0..359d5497 100644 --- a/java/src/test/files/rules/issues/Issue297Sha256TestFile.java +++ b/java/src/test/files/rules/issues/Issue297Sha256TestFile.java @@ -10,7 +10,7 @@ public class Issue297Sha256TestFile { private static final int staticEntropy4 = initStaticEntropy(); void test() { - SHA256Digest d = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA256}} + SHA256Digest d = new SHA256Digest(); // Noncompliant {{(MessageDigest) SHA-256}} d.update((byte)staticEntropy1); d.update((byte)staticEntropy2); d.update((byte)staticEntropy3); diff --git a/java/src/test/java/com/ibm/plugin/rules/benchmark/BenchmarkTest00003Test.java b/java/src/test/java/com/ibm/plugin/rules/benchmark/BenchmarkTest00003Test.java index 929bbf26..8ce6a8c6 100644 --- a/java/src/test/java/com/ibm/plugin/rules/benchmark/BenchmarkTest00003Test.java +++ b/java/src/test/java/com/ibm/plugin/rules/benchmark/BenchmarkTest00003Test.java @@ -76,7 +76,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // Oid under MessageDigest INode oidNode = messageDigestNode.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/benchmark/BenchmarkTest00009Test.java b/java/src/test/java/com/ibm/plugin/rules/benchmark/BenchmarkTest00009Test.java index 504af346..8178c575 100644 --- a/java/src/test/java/com/ibm/plugin/rules/benchmark/BenchmarkTest00009Test.java +++ b/java/src/test/java/com/ibm/plugin/rules/benchmark/BenchmarkTest00009Test.java @@ -76,7 +76,7 @@ public void asserts( INode messageDigestNode1 = nodes.get(0); assertThat(messageDigestNode1.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode1.getChildren()).hasSize(4); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA384"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-384"); // BlockSize under MessageDigest INode blockSizeNode1 = messageDigestNode1.getChildren().get(BlockSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/aeadcipher/BcChaCha20Poly1305Test.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/aeadcipher/BcChaCha20Poly1305Test.java index 629c5ad3..fa2c71c2 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/aeadcipher/BcChaCha20Poly1305Test.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/aeadcipher/BcChaCha20Poly1305Test.java @@ -117,7 +117,8 @@ public void asserts( INode authenticatedEncryptionNode1 = nodes.get(0); assertThat(authenticatedEncryptionNode1.getKind()).isEqualTo(AuthenticatedEncryption.class); assertThat(authenticatedEncryptionNode1.getChildren()).hasSize(findingId == 0 ? 3 : 2); - assertThat(authenticatedEncryptionNode1.asString()).isEqualTo("ChaCha20Poly1305"); + assertThat(authenticatedEncryptionNode1.asString()) + .isEqualTo(findingId == 0 ? "ChaCha20-Poly1305" : "ChaCha20Poly1305"); // Encrypt under AuthenticatedEncryption INode encryptNode1 = authenticatedEncryptionNode1.getChildren().get(Encrypt.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/asymmetricblockcipher/BcBufferedAsymmetricBlockCipherTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/asymmetricblockcipher/BcBufferedAsymmetricBlockCipherTest.java index 5ada6cf7..31ae9d25 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/asymmetricblockcipher/BcBufferedAsymmetricBlockCipherTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/asymmetricblockcipher/BcBufferedAsymmetricBlockCipherTest.java @@ -145,7 +145,7 @@ public void asserts( publicKeyEncryptionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(1); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest under PublicKeyEncryption INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -172,7 +172,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(1); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -249,7 +249,7 @@ public void asserts( publicKeyEncryptionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(1); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest under PublicKeyEncryption INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/asymmetricblockcipher/BcOAEPEncodingTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/asymmetricblockcipher/BcOAEPEncodingTest.java index 089908c5..9f5c7780 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/asymmetricblockcipher/BcOAEPEncodingTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/asymmetricblockcipher/BcOAEPEncodingTest.java @@ -169,7 +169,7 @@ public void asserts( publicKeyEncryptionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(2); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest under PublicKeyEncryption INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -223,7 +223,7 @@ public void asserts( INode messageDigestNode = digestSizeNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(1); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest under DigestSize INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -250,7 +250,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(1); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -360,7 +360,7 @@ public void asserts( maskGenerationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // Oid under MessageDigest under MaskGenerationFunction under PublicKeyEncryption INode oidNode2 = messageDigestNode.getChildren().get(Oid.class); @@ -397,7 +397,7 @@ public void asserts( publicKeyEncryptionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode1).isNotNull(); assertThat(messageDigestNode1.getChildren()).hasSize(1); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest under PublicKeyEncryption INode digestNode1 = messageDigestNode1.getChildren().get(Digest.class); @@ -424,7 +424,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(1); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -451,7 +451,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(1); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -478,7 +478,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/cipherparameters/BcCramerShoupParametersTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/cipherparameters/BcCramerShoupParametersTest.java index 41158b19..bdfc07c4 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/cipherparameters/BcCramerShoupParametersTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/cipherparameters/BcCramerShoupParametersTest.java @@ -103,7 +103,7 @@ public void asserts( INode messageDigestNode = blockCipherNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under BlockCipher INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -160,7 +160,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -220,7 +220,7 @@ public void asserts( INode messageDigestNode = blockCipherNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under BlockCipher INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -283,7 +283,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -343,7 +343,7 @@ public void asserts( INode messageDigestNode = blockCipherNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under BlockCipher INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -406,7 +406,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/cipherparameters/BcNTRUParametersTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/cipherparameters/BcNTRUParametersTest.java index 4713decb..c27089eb 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/cipherparameters/BcNTRUParametersTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/cipherparameters/BcNTRUParametersTest.java @@ -103,7 +103,7 @@ public void asserts( INode messageDigestNode = blockCipherNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest under BlockCipher INode oidNode1 = messageDigestNode.getChildren().get(Oid.class); @@ -160,7 +160,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -238,7 +238,7 @@ public void asserts( INode messageDigestNode = blockCipherNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under BlockCipher INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -283,7 +283,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -355,7 +355,7 @@ public void asserts( INode messageDigestNode = blockCipherNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under BlockCipher INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -406,7 +406,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -484,7 +484,7 @@ public void asserts( INode messageDigestNode = blockCipherNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under BlockCipher INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -529,7 +529,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -607,7 +607,7 @@ public void asserts( INode messageDigestNode = blockCipherNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under BlockCipher INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -652,7 +652,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -712,7 +712,7 @@ public void asserts( INode messageDigestNode = blockCipherNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under BlockCipher INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -775,7 +775,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest INode oidNode = messageDigestNode.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcHKDFBytesGeneratorTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcHKDFBytesGeneratorTest.java index cdb764ea..3f864f1f 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcHKDFBytesGeneratorTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcHKDFBytesGeneratorTest.java @@ -80,7 +80,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -134,14 +134,14 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under KeyDerivationFunction INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcHandshakeKDFFunctionTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcHandshakeKDFFunctionTest.java index 7fc4ad07..438a4039 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcHandshakeKDFFunctionTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcHandshakeKDFFunctionTest.java @@ -81,7 +81,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest INode oidNode = messageDigestNode.getChildren().get(Oid.class); @@ -142,7 +142,7 @@ public void asserts( keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under KeyDerivationFunction INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcKDFCounterBytesGeneratorTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcKDFCounterBytesGeneratorTest.java index f8ed5fde..9a1d0b2f 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcKDFCounterBytesGeneratorTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcKDFCounterBytesGeneratorTest.java @@ -83,7 +83,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -137,7 +137,7 @@ public void asserts( INode macNode = nodes.get(0); assertThat(macNode.getKind()).isEqualTo(Mac.class); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // Tag under Mac INode tagNode = macNode.getChildren().get(Tag.class); @@ -149,7 +149,7 @@ public void asserts( INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under Mac INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -218,13 +218,13 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("KDF in Counter Mode"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("SP800-108-CounterKDF"); // Mac under KeyDerivationFunction INode macNode = keyDerivationFunctionNode.getChildren().get(Mac.class); assertThat(macNode).isNotNull(); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // Tag under Mac under KeyDerivationFunction INode tagNode = macNode.getChildren().get(Tag.class); @@ -236,7 +236,7 @@ public void asserts( INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under Mac under KeyDerivationFunction INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcMGF1BytesGeneratorTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcMGF1BytesGeneratorTest.java index bb70ea70..948b8355 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcMGF1BytesGeneratorTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/derivationfunction/BcMGF1BytesGeneratorTest.java @@ -80,7 +80,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -142,7 +142,7 @@ public void asserts( maskGenerationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under MaskGenerationFunction INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcECIESKEMExtractorTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcECIESKEMExtractorTest.java index a38f8f2e..8f42e333 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcECIESKEMExtractorTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcECIESKEMExtractorTest.java @@ -84,7 +84,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -138,14 +138,14 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under KeyDerivationFunction INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -231,14 +231,14 @@ public void asserts( keyEncapsulationMechanismNode.getChildren().get(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode).isNotNull(); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction under KeyEncapsulationMechanism INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest under KeyDerivationFunction under KeyEncapsulationMechanism INode oidNode = messageDigestNode.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcECIESKEMGeneratorTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcECIESKEMGeneratorTest.java index b5df593a..2791c938 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcECIESKEMGeneratorTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcECIESKEMGeneratorTest.java @@ -84,7 +84,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -138,14 +138,14 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under KeyDerivationFunction INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -225,14 +225,14 @@ public void asserts( keyEncapsulationMechanismNode.getChildren().get(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode).isNotNull(); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction under KeyEncapsulationMechanism INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under KeyDerivationFunction under // KeyEncapsulationMechanism diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcRSAKEMExtractorTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcRSAKEMExtractorTest.java index 94fba66c..9dff0ce3 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcRSAKEMExtractorTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcRSAKEMExtractorTest.java @@ -84,7 +84,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -138,14 +138,14 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under KeyDerivationFunction INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -226,14 +226,14 @@ public void asserts( keyEncapsulationMechanismNode.getChildren().get(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode).isNotNull(); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction under KeyEncapsulationMechanism INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under KeyDerivationFunction under // KeyEncapsulationMechanism diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcRSAKEMGeneratorTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcRSAKEMGeneratorTest.java index 8c3b4fcf..57db1229 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcRSAKEMGeneratorTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/encapsulatedsecret/BcRSAKEMGeneratorTest.java @@ -85,7 +85,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest INode oidNode = messageDigestNode.getChildren().get(Oid.class); @@ -139,14 +139,14 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest under KeyDerivationFunction INode oidNode = messageDigestNode.getChildren().get(Oid.class); @@ -233,14 +233,14 @@ public void asserts( keyEncapsulationMechanismNode.getChildren().get(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode).isNotNull(); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(1); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction under KeyEncapsulationMechanism INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest under KeyDerivationFunction under KeyEncapsulationMechanism INode oidNode = messageDigestNode.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/mac/BcHMACTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/mac/BcHMACTest.java index 0d619a6c..4b4b4057 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/mac/BcHMACTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/mac/BcHMACTest.java @@ -80,7 +80,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -134,13 +134,13 @@ public void asserts( INode macNode = nodes.get(0); assertThat(macNode.getKind()).isEqualTo(Mac.class); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // MessageDigest under Mac INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under Mac INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/other/BcIESEngineTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/other/BcIESEngineTest.java index 28764b3c..2221e4c4 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/other/BcIESEngineTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/other/BcIESEngineTest.java @@ -129,7 +129,7 @@ public void asserts( keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under KeyDerivationFunction INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -174,7 +174,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -228,7 +228,7 @@ public void asserts( INode macNode = nodes.get(0); assertThat(macNode.getKind()).isEqualTo(Mac.class); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA512"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-512"); // Tag under Mac INode tagNode = macNode.getChildren().get(Tag.class); @@ -240,7 +240,7 @@ public void asserts( INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // BlockSize under MessageDigest under Mac INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -291,7 +291,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -354,7 +354,7 @@ public void asserts( keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under KeyDerivationFunction under PublicKeyEncryption INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -396,7 +396,7 @@ public void asserts( INode macNode = publicKeyEncryptionNode.getChildren().get(Mac.class); assertThat(macNode).isNotNull(); assertThat(macNode.getChildren()).hasSize(4); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA512"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-512"); // Tag under Mac under PublicKeyEncryption INode tagNode = macNode.getChildren().get(Tag.class); @@ -414,7 +414,7 @@ public void asserts( INode messageDigestNode1 = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode1).isNotNull(); assertThat(messageDigestNode1.getChildren()).hasSize(4); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-512"); // BlockSize under MessageDigest under Mac under PublicKeyEncryption INode blockSizeNode1 = messageDigestNode1.getChildren().get(BlockSize.class); @@ -524,7 +524,7 @@ public void asserts( keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under KeyDerivationFunction under PublicKeyEncryption INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -566,7 +566,7 @@ public void asserts( INode macNode = publicKeyEncryptionNode.getChildren().get(Mac.class); assertThat(macNode).isNotNull(); assertThat(macNode.getChildren()).hasSize(4); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA512"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-512"); // Tag under Mac under PublicKeyEncryption INode tagNode = macNode.getChildren().get(Tag.class); @@ -584,7 +584,7 @@ public void asserts( INode messageDigestNode1 = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode1).isNotNull(); assertThat(messageDigestNode1.getChildren()).hasSize(4); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-512"); // BlockSize under MessageDigest under Mac under PublicKeyEncryption INode blockSizeNode1 = messageDigestNode1.getChildren().get(BlockSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/other/BcSM2EngineTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/other/BcSM2EngineTest.java index 5afc1652..ab19a89f 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/other/BcSM2EngineTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/other/BcSM2EngineTest.java @@ -145,7 +145,7 @@ public void asserts( publicKeyEncryptionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under PublicKeyEncryption INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -196,7 +196,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/pbe/BcOpenSSLPBEParametersGeneratorTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/pbe/BcOpenSSLPBEParametersGeneratorTest.java index f7e8df1a..176c7663 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/pbe/BcOpenSSLPBEParametersGeneratorTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/pbe/BcOpenSSLPBEParametersGeneratorTest.java @@ -128,7 +128,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -190,7 +190,7 @@ public void asserts( passwordBasedEncryptionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under PasswordBasedEncryption INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/pbe/BcPKCS5S1ParametersGeneratorTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/pbe/BcPKCS5S1ParametersGeneratorTest.java index d026798c..2a275ebf 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/pbe/BcPKCS5S1ParametersGeneratorTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/pbe/BcPKCS5S1ParametersGeneratorTest.java @@ -81,7 +81,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -143,7 +143,7 @@ public void asserts( passwordBasedEncryptionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under PasswordBasedEncryption INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDSADigestSignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDSADigestSignerTest.java index ce0e905c..fa4869d7 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDSADigestSignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDSADigestSignerTest.java @@ -79,7 +79,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest INode oidNode = messageDigestNode.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDigestingMessageSignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDigestingMessageSignerTest.java index ec3da5ac..b345f2a9 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDigestingMessageSignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDigestingMessageSignerTest.java @@ -85,7 +85,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -277,7 +277,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under Signature INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDigestingStateAwareMessageSignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDigestingStateAwareMessageSignerTest.java index 6cb279fc..0994ea76 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDigestingStateAwareMessageSignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcDigestingStateAwareMessageSignerTest.java @@ -83,7 +83,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -241,7 +241,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under Signature INode digestSizeNode1 = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcEd25519ctxSignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcEd25519ctxSignerTest.java index 6e2ae086..16b7c2a2 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcEd25519ctxSignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcEd25519ctxSignerTest.java @@ -102,7 +102,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // BlockSize under MessageDigest under Signature INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcGenericSignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcGenericSignerTest.java index d5391ad0..dc454564 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcGenericSignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcGenericSignerTest.java @@ -107,7 +107,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -180,7 +180,7 @@ public void asserts( INode signatureNode = nodes.get(0); assertThat(signatureNode.getKind()).isEqualTo(Signature.class); assertThat(signatureNode.getChildren()).hasSize(3); - assertThat(signatureNode.asString()).isEqualTo("SHA256withRSA"); + assertThat(signatureNode.asString()).isEqualTo("SHA-256withRSA"); // Oid under Signature INode oidNode = signatureNode.getChildren().get(Oid.class); @@ -198,7 +198,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest under Signature INode oidNode1 = messageDigestNode.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcHashMLDSASignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcHashMLDSASignerTest.java index 0cc04ea8..6f18c7dd 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcHashMLDSASignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcHashMLDSASignerTest.java @@ -98,7 +98,7 @@ public void asserts( INode signatureNode = nodes.get(0); assertThat(signatureNode.getKind()).isEqualTo(Signature.class); assertThat(signatureNode.getChildren()).hasSize(4); - assertThat(signatureNode.asString()).isEqualTo("SHA512withML-DSA-44"); + assertThat(signatureNode.asString()).isEqualTo("SHA-512withML-DSA-44"); // Oid under Signature INode oidNode = signatureNode.getChildren().get(Oid.class); @@ -123,7 +123,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // DigestSize under MessageDigest under Signature INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcISO9796d2PSSSignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcISO9796d2PSSSignerTest.java index 2453810a..204707e6 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcISO9796d2PSSSignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcISO9796d2PSSSignerTest.java @@ -88,7 +88,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -259,7 +259,7 @@ public void asserts( probabilisticSignatureSchemeNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under ProbabilisticSignatureScheme INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcISO9796d2SignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcISO9796d2SignerTest.java index afde089f..4c009322 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcISO9796d2SignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcISO9796d2SignerTest.java @@ -79,7 +79,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcPSSSignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcPSSSignerTest.java index f0895a41..2c826456 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcPSSSignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcPSSSignerTest.java @@ -85,7 +85,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -130,7 +130,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // BlockSize under MessageDigest INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); @@ -217,7 +217,7 @@ public void asserts( assertThat(probabilisticSignatureSchemeNode.getKind()) .isEqualTo(ProbabilisticSignatureScheme.class); assertThat(probabilisticSignatureSchemeNode.getChildren()).hasSize(5); - assertThat(probabilisticSignatureSchemeNode.asString()).isEqualTo("RSASSA-PSS"); + assertThat(probabilisticSignatureSchemeNode.asString()).isEqualTo("RSA-PSS"); // Sign under ProbabilisticSignatureScheme INode signNode = probabilisticSignatureSchemeNode.getChildren().get(Sign.class); @@ -245,7 +245,7 @@ public void asserts( maskGenerationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // BlockSize under MessageDigest under MaskGenerationFunction under // ProbabilisticSignatureScheme @@ -299,7 +299,7 @@ public void asserts( probabilisticSignatureSchemeNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode1).isNotNull(); assertThat(messageDigestNode1.getChildren()).hasSize(4); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under ProbabilisticSignatureScheme INode blockSizeNode1 = messageDigestNode1.getChildren().get(BlockSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcRSADigestSignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcRSADigestSignerTest.java index 59c9560c..f43a990c 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcRSADigestSignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcRSADigestSignerTest.java @@ -82,7 +82,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -146,7 +146,7 @@ public void asserts( INode signatureNode = nodes.get(0); assertThat(signatureNode.getKind()).isEqualTo(Signature.class); assertThat(signatureNode.getChildren()).hasSize(3); - assertThat(signatureNode.asString()).isEqualTo("SHA256withRSA"); + assertThat(signatureNode.asString()).isEqualTo("SHA-256withRSA"); // Oid under Signature INode oidNode = signatureNode.getChildren().get(Oid.class); @@ -164,7 +164,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under Signature INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcSM2SignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcSM2SignerTest.java index 88233abc..d9d92b34 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcSM2SignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcSM2SignerTest.java @@ -82,7 +82,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -158,7 +158,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under Signature INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcX931SignerTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcX931SignerTest.java index 5f2b668e..7970eb59 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcX931SignerTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/bc/signer/BcX931SignerTest.java @@ -85,7 +85,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest INode oidNode = messageDigestNode.getChildren().get(Oid.class); @@ -220,7 +220,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest under Signature INode oidNode = messageDigestNode.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorGetInstanceTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorGetInstanceTest.java index 6b58d560..b96b6b0e 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorGetInstanceTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorGetInstanceTest.java @@ -70,6 +70,6 @@ public void asserts( INode node = nodes.get(0); assertThat(node).isInstanceOf(PublicKeyEncryption.class); assertThat(node).isInstanceOf(DH.class); - assertThat(node.asString()).isEqualTo("DH-3072"); + assertThat(node.asString()).isEqualTo("FFDH-3072"); } } diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorInitTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorInitTest.java index 3da999f8..77b1ed1c 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorInitTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmparametergenerator/JcaAlgorithmParameterGeneratorInitTest.java @@ -84,7 +84,7 @@ public void asserts( INode publicKeyEncryptionNode = nodes.get(0); assertThat(publicKeyEncryptionNode.getKind()).isEqualTo(PublicKeyEncryption.class); assertThat(publicKeyEncryptionNode.getChildren()).hasSize(2); - assertThat(publicKeyEncryptionNode.asString()).isEqualTo("DH-2048"); + assertThat(publicKeyEncryptionNode.asString()).isEqualTo("FFDH-2048"); // KeyLength under PublicKeyEncryption INode keyLengthNode = publicKeyEncryptionNode.getChildren().get(KeyLength.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmspec/JcaDHGenParameterSpecTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmspec/JcaDHGenParameterSpecTest.java index 4dbc002e..362512ac 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmspec/JcaDHGenParameterSpecTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmspec/JcaDHGenParameterSpecTest.java @@ -82,7 +82,7 @@ public void asserts( INode node = nodes.get(0); assertThat(node).isInstanceOf(PublicKeyEncryption.class); assertThat(node).isInstanceOf(DH.class); - assertThat(node.asString()).isEqualTo("DH-2048"); + assertThat(node.asString()).isEqualTo("FFDH-2048"); INode defaultKeyLength = node.getChildren().get(KeyLength.class); assertThat(defaultKeyLength).isNotNull(); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmspec/JcaGCMParameterSpecTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmspec/JcaGCMParameterSpecTest.java index 3e64905e..3a7c60d5 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmspec/JcaGCMParameterSpecTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmspec/JcaGCMParameterSpecTest.java @@ -145,13 +145,13 @@ public void asserts( assertThat(passwordBasedKeyDerivationFunctionNode).isNotNull(); assertThat(passwordBasedKeyDerivationFunctionNode.getChildren()).hasSize(2); assertThat(passwordBasedKeyDerivationFunctionNode.asString()) - .isEqualTo("PBKDF2-HMAC-SHA256"); + .isEqualTo("PBKDF2-HMAC-SHA-256"); // Mac under PasswordBasedKeyDerivationFunction under SecretKey INode macNode = passwordBasedKeyDerivationFunctionNode.getChildren().get(Mac.class); assertThat(macNode).isNotNull(); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // Oid under Mac under PasswordBasedKeyDerivationFunction under SecretKey INode oidNode = macNode.getChildren().get(Oid.class); @@ -163,7 +163,7 @@ public void asserts( INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest under Mac under PasswordBasedKeyDerivationFunction under // SecretKey diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/digest/JcaMessageDigestGetInstance2Test.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/digest/JcaMessageDigestGetInstance2Test.java index 9aaed47f..0ac6d9f5 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/digest/JcaMessageDigestGetInstance2Test.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/digest/JcaMessageDigestGetInstance2Test.java @@ -77,7 +77,7 @@ public void asserts( INode messageDigestNode1 = nodes.get(0); assertThat(messageDigestNode1.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode1.getChildren()).hasSize(4); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA384"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-384"); // Oid under MessageDigest INode oidNode1 = messageDigestNode1.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/digest/JcaMessageDigestGetInstanceTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/digest/JcaMessageDigestGetInstanceTest.java index b15c011e..7200cdf1 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/digest/JcaMessageDigestGetInstanceTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/digest/JcaMessageDigestGetInstanceTest.java @@ -71,7 +71,7 @@ public void asserts( assertThat(nodes).hasSize(1); INode node = nodes.get(0); assertThat(node).isInstanceOf(MessageDigest.class); - assertThat(node.asString()).isEqualTo("SHA512/224"); + assertThat(node.asString()).isEqualTo("SHA-512/224"); INode digestSize = node.getChildren().get(DigestSize.class); assertThat(digestSize).isNotNull(); @@ -90,7 +90,7 @@ public void asserts( INode digest = node.getChildren().get(MessageDigest.class); assertThat(digest).isNotNull(); - assertThat(digest.asString()).isEqualTo("SHA512"); + assertThat(digest.asString()).isEqualTo("SHA-512"); digestSize = digest.getChildren().get(DigestSize.class); assertThat(digestSize).isNotNull(); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretAlgorithmTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretAlgorithmTest.java index fbc1542a..5f327cd6 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretAlgorithmTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretAlgorithmTest.java @@ -81,7 +81,7 @@ public void asserts( assertThat(nodes).hasSize(1); INode node = nodes.get(0); assertThat(node).isNotNull(); - assertThat(node.asString()).isEqualTo("DH-3072"); + assertThat(node.asString()).isEqualTo("FFDH-3072"); assertThat(node.is(PublicKeyEncryption.class)).isTrue(); INode oid = node.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretKeySizeTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretKeySizeTest.java index 0959d6d4..8a380035 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretKeySizeTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretKeySizeTest.java @@ -78,7 +78,7 @@ public void asserts( assertThat(nodes).hasSize(1); INode node = nodes.get(0); assertThat(node).isNotNull(); - assertThat(node.asString()).isEqualTo("DH-2048"); + assertThat(node.asString()).isEqualTo("FFDH-2048"); INode oid = node.getChildren().get(Oid.class); assertThat(oid).isNotNull(); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretTest.java index 006f9a93..8105dcc3 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGenerateSecretTest.java @@ -70,7 +70,7 @@ public void asserts( assertThat(nodes).hasSize(1); INode node = nodes.get(0); assertThat(node).isNotNull(); - assertThat(node.asString()).isEqualTo("DH-3072"); + assertThat(node.asString()).isEqualTo("FFDH-3072"); INode oid = node.getChildren().get(Oid.class); assertThat(oid).isNotNull(); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGetInstanceTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGetInstanceTest.java index 5ad5b00a..35698475 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGetInstanceTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementGetInstanceTest.java @@ -68,7 +68,7 @@ public void asserts( assertThat(nodes).hasSize(1); INode node = nodes.get(0); assertThat(node).isNotNull(); - assertThat(node.asString()).isEqualTo("DH-3072"); + assertThat(node.asString()).isEqualTo("FFDH-3072"); INode keyLength = node.getChildren().get(KeyLength.class); assertThat(keyLength).isNotNull(); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementInitTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementInitTest.java index 86bb4fc5..43bcd4e5 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementInitTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyagreement/JcaKeyAgreementInitTest.java @@ -79,7 +79,7 @@ public void asserts( assertThat(nodes).hasSize(1); INode node = nodes.get(0); assertThat(node).isNotNull(); - assertThat(node.asString()).isEqualTo("DH-512"); + assertThat(node.asString()).isEqualTo("FFDH-512"); INode keyLength = node.getChildren().get(KeyLength.class); assertThat(keyLength).isNotNull(); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyspec/JcaPBEKeySpecTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyspec/JcaPBEKeySpecTest.java index 674b8825..3e2b8fa8 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyspec/JcaPBEKeySpecTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/keyspec/JcaPBEKeySpecTest.java @@ -121,19 +121,20 @@ public void asserts( secretKeyNode.getChildren().get(PasswordBasedKeyDerivationFunction.class); assertThat(passwordBasedKeyDerivationFunctionNode).isNotNull(); assertThat(passwordBasedKeyDerivationFunctionNode.getChildren()).hasSize(2); - assertThat(passwordBasedKeyDerivationFunctionNode.asString()).isEqualTo("PBKDF2-HMAC-SHA1"); + assertThat(passwordBasedKeyDerivationFunctionNode.asString()) + .isEqualTo("PBKDF2-HMAC-SHA-1"); // Mac under PasswordBasedKeyDerivationFunction under SecretKey INode macNode = passwordBasedKeyDerivationFunctionNode.getChildren().get(Mac.class); assertThat(macNode).isNotNull(); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA1"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-1"); // MessageDigest under Mac under PasswordBasedKeyDerivationFunction under SecretKey INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA1"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-1"); // BlockSize under MessageDigest under Mac under PasswordBasedKeyDerivationFunction under // SecretKey diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/mac/JcaMacGetInstanceTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/mac/JcaMacGetInstanceTest.java index 8087f69d..49b66ccd 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/mac/JcaMacGetInstanceTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/mac/JcaMacGetInstanceTest.java @@ -79,13 +79,13 @@ public void asserts( INode macNode = nodes.get(0); assertThat(macNode.getKind()).isEqualTo(Mac.class); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA3-384"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-3-384"); // MessageDigest under Mac INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3-384"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3-384"); // Digest under MessageDigest under Mac INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureActionSignTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureActionSignTest.java index 6c8b9b6f..6ef60c1a 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureActionSignTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureActionSignTest.java @@ -89,7 +89,7 @@ public void asserts( INode signatureNode = nodes.get(0); assertThat(signatureNode.getKind()).isEqualTo(Signature.class); assertThat(signatureNode.getChildren()).hasSize(4); - assertThat(signatureNode.asString()).isEqualTo("SHA384withDSA"); + assertThat(signatureNode.asString()).isEqualTo("SHA-384withDSA"); // KeyLength under Signature INode keyLengthNode = signatureNode.getChildren().get(KeyLength.class); @@ -113,7 +113,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA384"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-384"); // Digest under MessageDigest under Signature INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureActionVerifyTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureActionVerifyTest.java index a768bd50..a37a11d3 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureActionVerifyTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureActionVerifyTest.java @@ -89,7 +89,7 @@ public void asserts( INode signatureNode = nodes.get(0); assertThat(signatureNode.getKind()).isEqualTo(Signature.class); assertThat(signatureNode.getChildren()).hasSize(4); - assertThat(signatureNode.asString()).isEqualTo("SHA384withDSA"); + assertThat(signatureNode.asString()).isEqualTo("SHA-384withDSA"); // KeyLength under Signature INode keyLengthNode = signatureNode.getChildren().get(KeyLength.class); @@ -101,7 +101,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA384"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-384"); // BlockSize under MessageDigest under Signature INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureGetInstanceTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureGetInstanceTest.java index 4e8074e6..c041d520 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureGetInstanceTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureGetInstanceTest.java @@ -78,7 +78,7 @@ public void asserts( INode signatureNode = nodes.get(0); assertThat(signatureNode.getKind()).isEqualTo(Signature.class); assertThat(signatureNode.getChildren()).hasSize(3); - assertThat(signatureNode.asString()).isEqualTo("SHA384withDSA"); + assertThat(signatureNode.asString()).isEqualTo("SHA-384withDSA"); // KeyLength under Signature INode keyLengthNode = signatureNode.getChildren().get(KeyLength.class); @@ -96,7 +96,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA384"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-384"); // Oid under MessageDigest under Signature INode oidNode1 = messageDigestNode.getChildren().get(Oid.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameter2Test.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameter2Test.java index 037a291b..227bccbd 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameter2Test.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameter2Test.java @@ -97,7 +97,7 @@ public void asserts( INode node = nodes.get(0); assertThat(node).isInstanceOf(Signature.class); assertThat(node.is(ProbabilisticSignatureScheme.class)).isTrue(); - assertThat(node.asString()).isEqualTo("RSASSA-PSS"); + assertThat(node.asString()).isEqualTo("RSA-PSS"); INode oid = node.getChildren().get(Oid.class); assertThat(oid).isNotNull(); @@ -109,7 +109,7 @@ public void asserts( INode md = mgf1.getChildren().get(MessageDigest.class); assertThat(md).isNotNull(); - assertThat(md.asString()).isEqualTo("SHA256"); + assertThat(md.asString()).isEqualTo("SHA-256"); INode salt = node.getChildren().get(SaltLength.class); assertThat(salt).isNotNull(); @@ -117,6 +117,6 @@ public void asserts( md = node.getChildren().get(MessageDigest.class); assertThat(md).isNotNull(); - assertThat(md.asString()).isEqualTo("SHA3-256"); + assertThat(md.asString()).isEqualTo("SHA-3-256"); } } diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameter3Test.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameter3Test.java index 2716611b..5aa680bf 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameter3Test.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameter3Test.java @@ -103,7 +103,7 @@ public void asserts( assertThat(probabilisticSignatureSchemeNode.getKind()) .isEqualTo(ProbabilisticSignatureScheme.class); assertThat(probabilisticSignatureSchemeNode.getChildren()).hasSize(4); - assertThat(probabilisticSignatureSchemeNode.asString()).isEqualTo("RSASSA-PSS"); + assertThat(probabilisticSignatureSchemeNode.asString()).isEqualTo("RSA-PSS"); // SaltLength under ProbabilisticSignatureScheme INode saltLengthNode = probabilisticSignatureSchemeNode.getChildren().get(SaltLength.class); @@ -116,7 +116,7 @@ public void asserts( probabilisticSignatureSchemeNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3-256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3-256"); // DigestSize under MessageDigest under ProbabilisticSignatureScheme INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); @@ -154,7 +154,7 @@ public void asserts( maskGenerationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode1).isNotNull(); assertThat(messageDigestNode1.getChildren()).hasSize(4); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA1"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-1"); // DigestSize under MessageDigest under MaskGenerationFunction under // ProbabilisticSignatureScheme diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameterTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameterTest.java index d911a847..987d6560 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameterTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/jca/signature/JcaSignatureSetParameterTest.java @@ -84,7 +84,7 @@ public void asserts( assertThat(probabilisticSignatureSchemeNode.getKind()) .isEqualTo(ProbabilisticSignatureScheme.class); assertThat(probabilisticSignatureSchemeNode.getChildren()).hasSize(2); - assertThat(probabilisticSignatureSchemeNode.asString()).isEqualTo("RSASSA-PSS"); + assertThat(probabilisticSignatureSchemeNode.asString()).isEqualTo("RSA-PSS"); // SaltLength under ProbabilisticSignatureScheme INode saltLengthNode = probabilisticSignatureSchemeNode.getChildren().get(SaltLength.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/detection/ssl/SSLServerSocketSetEnabledCipherSuitesTest.java b/java/src/test/java/com/ibm/plugin/rules/detection/ssl/SSLServerSocketSetEnabledCipherSuitesTest.java index 60349799..57329be6 100644 --- a/java/src/test/java/com/ibm/plugin/rules/detection/ssl/SSLServerSocketSetEnabledCipherSuitesTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/detection/ssl/SSLServerSocketSetEnabledCipherSuitesTest.java @@ -96,6 +96,6 @@ public void asserts( INode assetCollectionNode = cipherSuiteNode.getChildren().get(AssetCollection.class); assertThat(assetCollectionNode).isNotNull(); assertThat(assetCollectionNode.getChildren()).isEmpty(); - assertThat(assetCollectionNode.asString()).isEqualTo("[DH, AES256-CBC, SHA256withDSA]"); + assertThat(assetCollectionNode.asString()).isEqualTo("[FFDH, AES256-CBC, SHA-256withDSA]"); } } diff --git a/java/src/test/java/com/ibm/plugin/rules/issues/DuplicateParameterFindingsTest.java b/java/src/test/java/com/ibm/plugin/rules/issues/DuplicateParameterFindingsTest.java index aa6aa0ee..026d3c1d 100644 --- a/java/src/test/java/com/ibm/plugin/rules/issues/DuplicateParameterFindingsTest.java +++ b/java/src/test/java/com/ibm/plugin/rules/issues/DuplicateParameterFindingsTest.java @@ -145,7 +145,7 @@ public void asserts( publicKeyEncryptionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(1); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest under PublicKeyEncryption INode digestNode = messageDigestNode.getChildren().get(Digest.class); @@ -171,7 +171,7 @@ public void asserts( maskGenerationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode1).isNotNull(); assertThat(messageDigestNode1.getChildren()).hasSize(4); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-512"); // BlockSize under MessageDigest under MaskGenerationFunction under PublicKeyEncryption INode blockSizeNode = messageDigestNode1.getChildren().get(BlockSize.class); @@ -217,7 +217,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(1); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3"); // Digest under MessageDigest INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/issues/Issue214Test.java b/java/src/test/java/com/ibm/plugin/rules/issues/Issue214Test.java index 63c0d03f..381b077d 100644 --- a/java/src/test/java/com/ibm/plugin/rules/issues/Issue214Test.java +++ b/java/src/test/java/com/ibm/plugin/rules/issues/Issue214Test.java @@ -78,7 +78,7 @@ public void asserts( INode signatureNode = nodes.get(0); assertThat(signatureNode.getKind()).isEqualTo(Signature.class); assertThat(signatureNode.getChildren()).hasSize(3); - assertThat(signatureNode.asString()).isEqualTo("SHA1withRSA"); + assertThat(signatureNode.asString()).isEqualTo("SHA-1withRSA"); // Oid under Signature INode oidNode = signatureNode.getChildren().get(Oid.class); @@ -90,7 +90,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA1"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-1"); // DigestSize under MessageDigest under Signature INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/java/src/test/java/com/ibm/plugin/rules/issues/Issue297Sha256Test.java b/java/src/test/java/com/ibm/plugin/rules/issues/Issue297Sha256Test.java index 22d164ff..f19b976e 100644 --- a/java/src/test/java/com/ibm/plugin/rules/issues/Issue297Sha256Test.java +++ b/java/src/test/java/com/ibm/plugin/rules/issues/Issue297Sha256Test.java @@ -78,7 +78,7 @@ public void asserts( INode messageDigestNode = nodes.get(0); assertThat(messageDigestNode.getKind()).isEqualTo(MessageDigest.class); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest INode oidNode = messageDigestNode.getChildren().get(Oid.class); diff --git a/mapper/src/main/java/com/ibm/mapper/model/algorithms/ChaCha20Poly1305.java b/mapper/src/main/java/com/ibm/mapper/model/algorithms/ChaCha20Poly1305.java index eb9e4df6..80f911f5 100644 --- a/mapper/src/main/java/com/ibm/mapper/model/algorithms/ChaCha20Poly1305.java +++ b/mapper/src/main/java/com/ibm/mapper/model/algorithms/ChaCha20Poly1305.java @@ -24,11 +24,25 @@ import com.ibm.mapper.utils.DetectionLocation; import javax.annotation.Nonnull; +/** + * + * + *

ChaCha20-Poly1305

+ * + *

+ * + *

Specification

+ * + * + */ public final class ChaCha20Poly1305 extends Algorithm implements AuthenticatedEncryption { @Override public @Nonnull String asString() { - return "ChaCha20Poly1305"; + return "ChaCha20-Poly1305"; } public ChaCha20Poly1305(@Nonnull DetectionLocation detectionLocation) { diff --git a/mapper/src/main/java/com/ibm/mapper/model/algorithms/DH.java b/mapper/src/main/java/com/ibm/mapper/model/algorithms/DH.java index 6257fb34..52eab162 100644 --- a/mapper/src/main/java/com/ibm/mapper/model/algorithms/DH.java +++ b/mapper/src/main/java/com/ibm/mapper/model/algorithms/DH.java @@ -32,7 +32,7 @@ /** * * - *

{@value #NAME}

+ *

FFDH (Finite Field Diffie-Hellman)

* *

* @@ -40,16 +40,18 @@ * *

* *

Other Names and Related Standards

* * */ public final class DH extends Algorithm implements Signature, KeyAgreement, PublicKeyEncryption { - private static final String NAME = "DH"; + private static final String NAME = "FFDH"; @Override public @Nonnull String asString() { diff --git a/mapper/src/main/java/com/ibm/mapper/model/algorithms/KDFCounter.java b/mapper/src/main/java/com/ibm/mapper/model/algorithms/KDFCounter.java index db281a59..dbdaeaff 100644 --- a/mapper/src/main/java/com/ibm/mapper/model/algorithms/KDFCounter.java +++ b/mapper/src/main/java/com/ibm/mapper/model/algorithms/KDFCounter.java @@ -28,7 +28,7 @@ /** * * - *

{@value #NAME}

+ *

SP800-108 Counter Mode KDF

* *

* @@ -36,16 +36,18 @@ * *

* *

Other Names and Related Standards

* * */ public final class KDFCounter extends Algorithm implements KeyDerivationFunction { - private static final String NAME = "KDF in Counter Mode"; + private static final String NAME = "SP800-108-CounterKDF"; public KDFCounter(@Nonnull DetectionLocation detectionLocation) { super(NAME, KeyDerivationFunction.class, detectionLocation); diff --git a/mapper/src/main/java/com/ibm/mapper/model/algorithms/KDFFeedback.java b/mapper/src/main/java/com/ibm/mapper/model/algorithms/KDFFeedback.java index 0f9f955b..b276f666 100644 --- a/mapper/src/main/java/com/ibm/mapper/model/algorithms/KDFFeedback.java +++ b/mapper/src/main/java/com/ibm/mapper/model/algorithms/KDFFeedback.java @@ -28,7 +28,7 @@ /** * * - *

{@value #NAME}

+ *

SP800-108 Feedback Mode KDF

* *

* @@ -36,16 +36,18 @@ * *

* *

Other Names and Related Standards

* * */ public final class KDFFeedback extends Algorithm implements KeyDerivationFunction { - private static final String NAME = "KDF in Feedback Mode"; + private static final String NAME = "SP800-108-FeedbackKDF"; public KDFFeedback(@Nonnull DetectionLocation detectionLocation) { super(NAME, KeyDerivationFunction.class, detectionLocation); diff --git a/mapper/src/main/java/com/ibm/mapper/model/algorithms/RSAssaPSS.java b/mapper/src/main/java/com/ibm/mapper/model/algorithms/RSAssaPSS.java index 7d8fe144..f9cabe42 100644 --- a/mapper/src/main/java/com/ibm/mapper/model/algorithms/RSAssaPSS.java +++ b/mapper/src/main/java/com/ibm/mapper/model/algorithms/RSAssaPSS.java @@ -27,7 +27,7 @@ /** * * - *

{@value #NAME}

+ *

RSA-PSS (RSA Probabilistic Signature Scheme)

* *

* @@ -35,16 +35,18 @@ * *

* *

Other Names and Related Standards

* * */ public final class RSAssaPSS extends Algorithm implements ProbabilisticSignatureScheme { public RSAssaPSS(@Nonnull DetectionLocation detectionLocation) { - super("RSASSA-PSS", ProbabilisticSignatureScheme.class, detectionLocation); + super("RSA-PSS", ProbabilisticSignatureScheme.class, detectionLocation); } } diff --git a/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA.java b/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA.java index 1d5277c0..3a37e9ed 100644 --- a/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA.java +++ b/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA.java @@ -28,6 +28,20 @@ import com.ibm.mapper.utils.DetectionLocation; import javax.annotation.Nonnull; +/** + * + * + *

SHA-1 (Secure Hash Algorithm 1)

+ * + *

+ * + *

Specification

+ * + * + */ public final class SHA extends Algorithm implements MessageDigest { public SHA(@Nonnull DetectionLocation detectionLocation) { @@ -37,7 +51,7 @@ public SHA(@Nonnull DetectionLocation detectionLocation) { public SHA( @Nonnull final Class asKind, @Nonnull DetectionLocation detectionLocation) { - super("SHA1", asKind, detectionLocation); + super("SHA-1", asKind, detectionLocation); this.put(BlockSize.ofDefault(512, detectionLocation)); this.put(new DigestSize(160, detectionLocation)); this.put(new Oid("1.3.14.3.2.26", detectionLocation)); diff --git a/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA2.java b/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA2.java index 54d1ba57..9be9b27c 100644 --- a/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA2.java +++ b/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA2.java @@ -29,23 +29,26 @@ /** * * - *

{@value #NAME}

+ *

SHA-2 (Secure Hash Algorithm 2)

* *

* *

Specification

* * * *

Other Names and Related Standards

* * */ public final class SHA2 extends Algorithm implements MessageDigest { - private static final String NAME = "SHA"; + private static final String NAME = "SHA-"; public SHA2(int digestSize, @Nonnull DetectionLocation detectionLocation) { super(NAME + digestSize, MessageDigest.class, detectionLocation); diff --git a/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA3.java b/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA3.java index 10ed19a4..0e44ef2e 100644 --- a/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA3.java +++ b/mapper/src/main/java/com/ibm/mapper/model/algorithms/SHA3.java @@ -29,23 +29,26 @@ /** * * - *

{@value #NAME}

+ *

SHA-3 (Secure Hash Algorithm 3)

* *

* *

Specification

* * * *

Other Names and Related Standards

* * */ public final class SHA3 extends Algorithm implements MessageDigest { - private static final String NAME = "SHA3"; + private static final String NAME = "SHA-3"; public SHA3(@Nonnull DetectionLocation detectionLocation) { super(NAME, MessageDigest.class, detectionLocation); diff --git a/mapper/src/main/java/com/ibm/mapper/model/algorithms/SPHINCSPlus.java b/mapper/src/main/java/com/ibm/mapper/model/algorithms/SPHINCSPlus.java index 48f7f2cb..29a92f84 100644 --- a/mapper/src/main/java/com/ibm/mapper/model/algorithms/SPHINCSPlus.java +++ b/mapper/src/main/java/com/ibm/mapper/model/algorithms/SPHINCSPlus.java @@ -28,7 +28,7 @@ /** * * - *

{@value #NAME}

+ *

SLH-DSA (Stateless Hash-Based Digital Signature Algorithm)

* *

* @@ -36,16 +36,19 @@ * *

* *

Other Names and Related Standards

* * */ public class SPHINCSPlus extends Algorithm implements Signature { - private static final String NAME = "SPHINCS+"; + private static final String NAME = "SLH-DSA"; @Override public @Nonnull String asString() { diff --git a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaMacMapperTest.java b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaMacMapperTest.java index b105750c..022b3777 100644 --- a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaMacMapperTest.java +++ b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaMacMapperTest.java @@ -45,7 +45,7 @@ void truncatedDigest() { jcaMacMapper.parse("HmacSHA512/224", testDetectionLocation); assertThat(macOptional).isPresent(); - assertThat(macOptional.get().asString()).isEqualTo("HMAC-SHA512/224"); + assertThat(macOptional.get().asString()).isEqualTo("HMAC-SHA-512/224"); assertThat(macOptional.get().hasChildren()).isTrue(); Map, INode> children = macOptional.get().getChildren(); @@ -54,7 +54,7 @@ void truncatedDigest() { INode child = children.get(MessageDigest.class); assertThat(child.is(MessageDigest.class)).isTrue(); MessageDigest messageDigest = (MessageDigest) child; - assertThat(messageDigest.getName()).isEqualTo("SHA512/224"); + assertThat(messageDigest.getName()).isEqualTo("SHA-512/224"); assertThat(messageDigest.getDigestSize()).isPresent(); assertThat(messageDigest.getDigestSize().get().getValue()).isEqualTo(224); } @@ -105,7 +105,7 @@ void pbe() { Optional mac = pbe.getMac(); assertThat(mac).isPresent(); - assertThat(mac.get().asString()).isEqualTo("HMAC-SHA256"); + assertThat(mac.get().asString()).isEqualTo("HMAC-SHA-256"); assertThat(mac.get().hasChildren()).isTrue(); Map, INode> children = mac.get().getChildren(); @@ -113,7 +113,7 @@ void pbe() { MessageDigest messageDigest = (MessageDigest) children.get(MessageDigest.class); assertThat(messageDigest).isInstanceOf(SHA2.class); - assertThat(messageDigest.getName()).isEqualTo("SHA256"); + assertThat(messageDigest.getName()).isEqualTo("SHA-256"); assertThat(messageDigest.getDigestSize()).isPresent(); assertThat(messageDigest.getDigestSize().get().getValue()).isEqualTo(256); } diff --git a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaMessageDigestMapperTest.java b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaMessageDigestMapperTest.java index a3f32f12..c1b4d5ac 100644 --- a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaMessageDigestMapperTest.java +++ b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaMessageDigestMapperTest.java @@ -41,7 +41,7 @@ void base() { jcaMessageDigestMapper.parse("SHA3-224", testDetectionLocation); assertThat(messageDigestOptional).isPresent(); - assertThat(messageDigestOptional.get().getName()).isEqualTo("SHA3-224"); + assertThat(messageDigestOptional.get().getName()).isEqualTo("SHA-3-224"); assertThat(messageDigestOptional.get().getDigestSize()).isPresent(); assertThat(messageDigestOptional.get().getDigestSize().get().getValue()).isEqualTo(224); } @@ -57,7 +57,7 @@ void complex() { assertThat(messageDigestOptional).isPresent(); MessageDigest messageDigest = messageDigestOptional.get(); - assertThat(messageDigest.getName()).isEqualTo("SHA512/224"); + assertThat(messageDigest.getName()).isEqualTo("SHA-512/224"); assertThat(messageDigest.getDigestSize()).isPresent(); assertThat(messageDigest.getDigestSize().get().getValue()).isEqualTo(224); assertThat(messageDigest.hasChildren()).isTrue(); diff --git a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPBKDFMapperTest.java b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPBKDFMapperTest.java index a950f113..4f47b2f4 100644 --- a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPBKDFMapperTest.java +++ b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPBKDFMapperTest.java @@ -47,7 +47,7 @@ void base() { assertThat(pbkdfOptional.get()).isInstanceOf(PBKDF2.class); assertThat(pbkdfOptional.get()).isInstanceOf(KeyDerivationFunction.class); assertThat(pbkdfOptional.get().is(PasswordBasedKeyDerivationFunction.class)).isTrue(); - assertThat(pbkdfOptional.get().asString()).isEqualTo("PBKDF2-HMAC-SHA256"); + assertThat(pbkdfOptional.get().asString()).isEqualTo("PBKDF2-HMAC-SHA-256"); assertThat(pbkdfOptional.get().getIterations()).isEmpty(); assertThat(pbkdfOptional.get().getSalt()).isEmpty(); assertThat(pbkdfOptional.get().hasChildren()).isTrue(); @@ -58,6 +58,6 @@ void base() { assertThat(child.is(Mac.class)).isTrue(); Mac mac = (Mac) child; - assertThat(mac.asString()).isEqualTo("HMAC-SHA256"); + assertThat(mac.asString()).isEqualTo("HMAC-SHA-256"); } } diff --git a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPRNGMapperTest.java b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPRNGMapperTest.java index 192d5d42..c3f0af66 100644 --- a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPRNGMapperTest.java +++ b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPRNGMapperTest.java @@ -55,7 +55,7 @@ void sha1prng() { jcaPRNGMapper.parse("SHA1PRNG", testDetectionLocation); assertThat(prngOptional).isPresent(); assertThat(prngOptional.get()).isInstanceOf(PseudorandomNumberGenerator.class); - assertThat(prngOptional.get().getName()).isEqualTo("SHA1"); + assertThat(prngOptional.get().getName()).isEqualTo("SHA-1"); assertThat(prngOptional.get().hasChildren()).isTrue(); } } diff --git a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPasswordBasedEncryptionMapperTest.java b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPasswordBasedEncryptionMapperTest.java index 81b78cd2..3547af1e 100644 --- a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPasswordBasedEncryptionMapperTest.java +++ b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaPasswordBasedEncryptionMapperTest.java @@ -46,7 +46,7 @@ void base() { assertThat(pbeOpt).isPresent(); PasswordBasedEncryption pbe = pbeOpt.get(); assertThat(pbe.getName()).isEqualTo("PBES1"); - assertThat(pbe.asString()).isEqualTo("pbeWithHmacSHA256AndAES"); + assertThat(pbe.asString()).isEqualTo("pbeWithHmacSHA-256AndAES"); assertThat(pbe.getChildren()).hasSize(2); assertThat(pbe.getDigest()).isEmpty(); @@ -54,7 +54,7 @@ void base() { assertThat(pbe.getMac()).isPresent(); Mac mac = pbe.getMac().get(); - assertThat(mac.asString()).isEqualTo("HMAC-SHA256"); + assertThat(mac.asString()).isEqualTo("HMAC-SHA-256"); assertThat(mac.getChildren()).hasSize(1); Cipher cipher = pbe.getCipher().get(); diff --git a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaSignatureMapperTest.java b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaSignatureMapperTest.java index 8844e384..ad05413e 100644 --- a/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaSignatureMapperTest.java +++ b/mapper/src/test/java/com/ibm/mapper/mapper/jca/JcaSignatureMapperTest.java @@ -68,7 +68,7 @@ void SHA384withDSA() { assertThat(signatureOptional.get().getDigest()).isPresent(); MessageDigest messageDigest = signatureOptional.get().getDigest().get(); assertThat(messageDigest).isInstanceOf(SHA2.class); - assertThat(messageDigest.getName()).isEqualTo("SHA384"); + assertThat(messageDigest.getName()).isEqualTo("SHA-384"); assertThat(messageDigest.getDigestSize()).isPresent(); assertThat(messageDigest.getDigestSize().get().getValue()).isEqualTo(384); } @@ -89,7 +89,7 @@ void SHA3_224withECDSA() { assertThat(signatureOptional.get().getDigest()).isPresent(); MessageDigest messageDigest = signatureOptional.get().getDigest().get(); assertThat(messageDigest).isInstanceOf(SHA3.class); - assertThat(messageDigest.getName()).isEqualTo("SHA3-224"); + assertThat(messageDigest.getName()).isEqualTo("SHA-3-224"); assertThat(messageDigest.getDigestSize()).isPresent(); assertThat(messageDigest.getDigestSize().get().getValue()).isEqualTo(224); } @@ -111,7 +111,7 @@ void SHA1withDSAinP1363Format() { assertThat(signatureOptional.get().getDigest()).isPresent(); MessageDigest messageDigest = signatureOptional.get().getDigest().get(); assertThat(messageDigest).isInstanceOf(SHA.class); - assertThat(messageDigest.getName()).isEqualTo("SHA1"); + assertThat(messageDigest.getName()).isEqualTo("SHA-1"); assertThat(messageDigest.getDigestSize()).isPresent(); assertThat(messageDigest.getDigestSize().get().getValue()).isEqualTo(160); } @@ -128,7 +128,7 @@ void RSASSA_PSS() { assertThat(signatureOptional).isPresent(); assertThat(signatureOptional.get()).isInstanceOf(RSAssaPSS.class); assertThat(signatureOptional.get().is(ProbabilisticSignatureScheme.class)).isTrue(); - assertThat(signatureOptional.get().getName()).isEqualTo("RSASSA-PSS"); + assertThat(signatureOptional.get().getName()).isEqualTo("RSA-PSS"); assertThat(signatureOptional.get().getFormat()).isEmpty(); } } diff --git a/output/src/test/java/com/ibm/output/cyclonedx/AlgorithmTest.java b/output/src/test/java/com/ibm/output/cyclonedx/AlgorithmTest.java index bdcd539d..afe68f8a 100644 --- a/output/src/test/java/com/ibm/output/cyclonedx/AlgorithmTest.java +++ b/output/src/test/java/com/ibm/output/cyclonedx/AlgorithmTest.java @@ -122,14 +122,14 @@ void pbkdfWithSaltAndPassword() { bom -> { assertThat(bom.getComponents()).hasSize(4); assertThat(bom.getComponents().stream().map(Component::getName)) - .contains("PBKDF2-SHA1", "SHA1"); + .contains("PBKDF2-SHA-1", "SHA-1"); for (Component component : bom.getComponents()) { asserts(component.getEvidence()); assertThat(component.getCryptoProperties()).isNotNull(); final CryptoProperties cryptoProperties = component.getCryptoProperties(); - if (component.getName().equalsIgnoreCase("PBKDF2-SHA1")) { + if (component.getName().equalsIgnoreCase("PBKDF2-SHA-1")) { assertThat(cryptoProperties.getAssetType()) .isEqualTo(AssetType.ALGORITHM); assertThat(cryptoProperties.getAlgorithmProperties()).isNotNull(); @@ -138,7 +138,7 @@ void pbkdfWithSaltAndPassword() { assertThat(algorithmProperties.getPrimitive()).isEqualTo(Primitive.KDF); assertThat(algorithmProperties.getParameterSetIdentifier()) .isEqualTo("1024"); - } else if (component.getName().equalsIgnoreCase("SHA1")) { + } else if (component.getName().equalsIgnoreCase("SHA-1")) { assertThat(cryptoProperties.getAssetType()) .isEqualTo(AssetType.ALGORITHM); assertThat(cryptoProperties.getAlgorithmProperties()).isNotNull(); @@ -187,7 +187,7 @@ void signature() { bom -> { assertThat(bom.getComponents()).hasSize(3); assertThat(bom.getComponents().stream().map(Component::getName)) - .contains("SHA256withDSA", "SHA256"); + .contains("SHA-256withDSA", "SHA-256"); for (Component component : bom.getComponents()) { asserts(component.getEvidence()); @@ -209,13 +209,13 @@ void signature() { final AlgorithmProperties algorithmProperties = cryptoProperties.getAlgorithmProperties(); if (algorithmProperties.getPrimitive().equals(Primitive.SIGNATURE)) { - assertThat(component.getName()).isEqualTo("SHA256withDSA"); + assertThat(component.getName()).isEqualTo("SHA-256withDSA"); assertThat(cryptoProperties.getOid()) .isEqualTo("2.16.840.1.101.3.4.3.2"); assertThat(algorithmProperties.getCryptoFunctions()) .contains(CryptoFunction.SIGN, CryptoFunction.KEYGEN); } else if (algorithmProperties.getPrimitive().equals(Primitive.HASH)) { - assertThat(component.getName()).isEqualTo("SHA256"); + assertThat(component.getName()).isEqualTo("SHA-256"); assertThat(cryptoProperties.getOid()) .isEqualTo("2.16.840.1.101.3.4.2.1"); assertThat(algorithmProperties.getParameterSetIdentifier()) @@ -253,7 +253,7 @@ void rsaOAEP() { bom -> { assertThat(bom.getComponents()).hasSize(5); assertThat(bom.getComponents().stream().map(Component::getName)) - .contains("RSA-OAEP", "SHA256", "MGF1", "SHA384"); + .contains("RSA-OAEP", "SHA-256", "MGF1", "SHA-384"); for (Component component : bom.getComponents()) { asserts(component.getEvidence()); @@ -285,8 +285,8 @@ void rsaOAEP() { } else if (algorithmProperties.getPrimitive().equals(Primitive.HASH)) { assertThat(component.getName()) .satisfiesAnyOf( - s -> assertThat(s).isEqualTo("SHA256"), - s -> assertThat(s).isEqualTo("SHA384")); + s -> assertThat(s).isEqualTo("SHA-256"), + s -> assertThat(s).isEqualTo("SHA-384")); } else if (algorithmProperties.getPrimitive().equals(Primitive.OTHER)) { assertThat(component.getName()).isEqualTo("MGF1"); assertThat(cryptoProperties.getOid()) @@ -322,7 +322,7 @@ void rsaPSS() { bom -> { assertThat(bom.getComponents()).hasSize(5); assertThat(bom.getComponents().stream().map(Component::getName)) - .contains("RSASSA-PSS", "SHA256", "MGF1", "SHA384"); + .contains("RSA-PSS", "SHA-256", "MGF1", "SHA-384"); for (Component component : bom.getComponents()) { asserts(component.getEvidence()); @@ -344,7 +344,7 @@ void rsaPSS() { final AlgorithmProperties algorithmProperties = cryptoProperties.getAlgorithmProperties(); if (algorithmProperties.getPrimitive().equals(Primitive.SIGNATURE)) { - assertThat(component.getName()).isEqualTo("RSASSA-PSS"); + assertThat(component.getName()).isEqualTo("RSA-PSS"); assertThat(cryptoProperties.getOid()) .isEqualTo("1.2.840.113549.1.1.10"); assertThat(algorithmProperties.getCryptoFunctions()) @@ -352,8 +352,8 @@ void rsaPSS() { } else if (algorithmProperties.getPrimitive().equals(Primitive.HASH)) { assertThat(component.getName()) .satisfiesAnyOf( - s -> assertThat(s).isEqualTo("SHA256"), - s -> assertThat(s).isEqualTo("SHA384")); + s -> assertThat(s).isEqualTo("SHA-256"), + s -> assertThat(s).isEqualTo("SHA-384")); } else if (algorithmProperties.getPrimitive().equals(Primitive.OTHER)) { assertThat(component.getName()).isEqualTo("MGF1"); assertThat(cryptoProperties.getOid()) diff --git a/output/src/test/java/com/ibm/output/cyclonedx/ProtocolTest.java b/output/src/test/java/com/ibm/output/cyclonedx/ProtocolTest.java index faaa5609..e38ef75c 100644 --- a/output/src/test/java/com/ibm/output/cyclonedx/ProtocolTest.java +++ b/output/src/test/java/com/ibm/output/cyclonedx/ProtocolTest.java @@ -97,7 +97,7 @@ void cipherSuite() { bom -> { assertThat(bom.getComponents()).hasSize(5); assertThat(bom.getComponents().stream().map(Component::getName)) - .contains("SHA256withDSA", "SHA256", "AES256-CBC", "TLS", "DH"); + .contains("SHA-256withDSA", "SHA-256", "AES256-CBC", "TLS", "FFDH"); for (Component component : bom.getComponents()) { asserts(component.getEvidence()); @@ -109,17 +109,17 @@ void cipherSuite() { final AlgorithmProperties algorithmProperties = cryptoProperties.getAlgorithmProperties(); if (algorithmProperties.getPrimitive().equals(Primitive.SIGNATURE)) { - assertThat(component.getName()).isEqualTo("SHA256withDSA"); + assertThat(component.getName()).isEqualTo("SHA-256withDSA"); assertThat(cryptoProperties.getOid()) .isEqualTo("2.16.840.1.101.3.4.3.2"); } else if (algorithmProperties.getPrimitive().equals(Primitive.HASH)) { - assertThat(component.getName()).isEqualTo("SHA256"); + assertThat(component.getName()).isEqualTo("SHA-256"); assertThat(algorithmProperties.getParameterSetIdentifier()) .isEqualTo("256"); } else if (algorithmProperties .getPrimitive() .equals(Primitive.KEY_AGREE)) { - assertThat(component.getName()).isEqualTo("DH"); + assertThat(component.getName()).isEqualTo("FFDH"); assertThat(cryptoProperties.getOid()) .isEqualTo("1.2.840.113549.1.3.1"); } else if (algorithmProperties @@ -182,7 +182,7 @@ void protocolWithCipherSuite() { bom -> { assertThat(bom.getComponents()).hasSize(5); assertThat(bom.getComponents().stream().map(Component::getName)) - .contains("SHA256withDSA", "SHA256", "AES256-CBC", "TLSv1.3", "DH"); + .contains("SHA-256withDSA", "SHA-256", "AES256-CBC", "TLSv1.3", "FFDH"); for (Component component : bom.getComponents()) { asserts(component.getEvidence()); @@ -194,17 +194,17 @@ void protocolWithCipherSuite() { final AlgorithmProperties algorithmProperties = cryptoProperties.getAlgorithmProperties(); if (algorithmProperties.getPrimitive().equals(Primitive.SIGNATURE)) { - assertThat(component.getName()).isEqualTo("SHA256withDSA"); + assertThat(component.getName()).isEqualTo("SHA-256withDSA"); assertThat(cryptoProperties.getOid()) .isEqualTo("2.16.840.1.101.3.4.3.2"); } else if (algorithmProperties.getPrimitive().equals(Primitive.HASH)) { - assertThat(component.getName()).isEqualTo("SHA256"); + assertThat(component.getName()).isEqualTo("SHA-256"); assertThat(algorithmProperties.getParameterSetIdentifier()) .isEqualTo("256"); } else if (algorithmProperties .getPrimitive() .equals(Primitive.KEY_AGREE)) { - assertThat(component.getName()).isEqualTo("DH"); + assertThat(component.getName()).isEqualTo("FFDH"); assertThat(cryptoProperties.getOid()) .isEqualTo("1.2.840.113549.1.3.1"); } else if (algorithmProperties diff --git a/python/src/test/files/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanGenerateTestFile.py b/python/src/test/files/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanGenerateTestFile.py index d216b49e..ea45be61 100644 --- a/python/src/test/files/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanGenerateTestFile.py +++ b/python/src/test/files/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanGenerateTestFile.py @@ -3,4 +3,4 @@ # Generate some parameters. These can be reused. parameters = dh.generate_parameters(generator=2, key_size=2048) # Generate a private key for use in the exchange. -server_private_key = parameters.generate_private_key() # Noncompliant {{(PrivateKey) DH}} +server_private_key = parameters.generate_private_key() # Noncompliant {{(PrivateKey) FFDH}} diff --git a/python/src/test/files/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanNumbersTestFile.py b/python/src/test/files/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanNumbersTestFile.py index 273fdfba..06a8ae83 100644 --- a/python/src/test/files/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanNumbersTestFile.py +++ b/python/src/test/files/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanNumbersTestFile.py @@ -8,6 +8,6 @@ def generate_dh_key_from_parameters( """ Generates a DH private key from parameters p, g, x, and y. """ - public_numbers = dh.DHPublicNumbers(y, p, g) # Noncompliant {{(PublicKey) DH}} - private_numbers = DHPrivateNumbers(x, public_numbers) # Noncompliant {{(PublicKey) DH}} + public_numbers = dh.DHPublicNumbers(y, p, g) # Noncompliant {{(PublicKey) FFDH}} + private_numbers = DHPrivateNumbers(x, public_numbers) # Noncompliant {{(PublicKey) FFDH}} return private_numbers.private_key(default_backend()) diff --git a/python/src/test/files/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveKeyExchangeTestFile.py b/python/src/test/files/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveKeyExchangeTestFile.py index e7d7f7ed..b1d727b3 100644 --- a/python/src/test/files/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveKeyExchangeTestFile.py +++ b/python/src/test/files/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveKeyExchangeTestFile.py @@ -12,7 +12,7 @@ def exchange(public_key): ec.ECDH(), public_key) # Perform key derivation. // TODO: How should this key derivation be linked to the private key? - derived_key = HKDF( # Noncompliant {{(KeyDerivationFunction) HKDF-SHA256}} + derived_key = HKDF( # Noncompliant {{(KeyDerivationFunction) HKDF-SHA-256}} algorithm=hashes.SHA256(), length=32, salt=None, diff --git a/python/src/test/files/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSign2TestFile.py b/python/src/test/files/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSign2TestFile.py index e6528309..25f8c2f4 100644 --- a/python/src/test/files/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSign2TestFile.py +++ b/python/src/test/files/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSign2TestFile.py @@ -17,7 +17,7 @@ # # PrivateKey EC # Signature EdDSA -# MessageDigest SHA512 +# MessageDigest SHA-512 # EllipticCurveAlgorithm EC # EllipticCurve Curve25519 # Sign SIGN diff --git a/python/src/test/files/rules/detection/kdf/PycaHKDFExpandTestFile.py b/python/src/test/files/rules/detection/kdf/PycaHKDFExpandTestFile.py index 03baee51..08108818 100644 --- a/python/src/test/files/rules/detection/kdf/PycaHKDFExpandTestFile.py +++ b/python/src/test/files/rules/detection/kdf/PycaHKDFExpandTestFile.py @@ -5,7 +5,7 @@ info = b"hkdf-example" key_material = os.urandom(16) -hkdf = HKDFExpand( # Noncompliant {{(KeyDerivationFunction) HKDF-SHA256}} +hkdf = HKDFExpand( # Noncompliant {{(KeyDerivationFunction) HKDF-SHA-256}} algorithm=hashes.SHA256(), length=32, info=info, diff --git a/python/src/test/files/rules/detection/kdf/PycaHKDFTestFile.py b/python/src/test/files/rules/detection/kdf/PycaHKDFTestFile.py index 2543f9ff..eb0a673b 100644 --- a/python/src/test/files/rules/detection/kdf/PycaHKDFTestFile.py +++ b/python/src/test/files/rules/detection/kdf/PycaHKDFTestFile.py @@ -5,7 +5,7 @@ salt = os.urandom(16) info = b"hkdf-example" -hkdf = HKDF( # Noncompliant {{(KeyDerivationFunction) HKDF-SHA256}} +hkdf = HKDF( # Noncompliant {{(KeyDerivationFunction) HKDF-SHA-256}} algorithm=hashes.SHA256(), length=32, salt=salt, diff --git a/python/src/test/files/rules/detection/kdf/PycaKBKDFHMACTestFile.py b/python/src/test/files/rules/detection/kdf/PycaKBKDFHMACTestFile.py index a346973b..f29af21d 100644 --- a/python/src/test/files/rules/detection/kdf/PycaKBKDFHMACTestFile.py +++ b/python/src/test/files/rules/detection/kdf/PycaKBKDFHMACTestFile.py @@ -7,7 +7,7 @@ label = b"KBKDF HMAC Label" context = b"KBKDF HMAC Context" -kdf = KBKDFHMAC( # Noncompliant {{(Mac) HMAC-SHA256}} +kdf = KBKDFHMAC( # Noncompliant {{(Mac) HMAC-SHA-256}} algorithm=hashes.SHA256(), mode=Mode.CounterMode, length=32, diff --git a/python/src/test/files/rules/detection/kdf/PycaPBKDF2TestFile.py b/python/src/test/files/rules/detection/kdf/PycaPBKDF2TestFile.py index 30091b8b..6baeb886 100644 --- a/python/src/test/files/rules/detection/kdf/PycaPBKDF2TestFile.py +++ b/python/src/test/files/rules/detection/kdf/PycaPBKDF2TestFile.py @@ -6,7 +6,7 @@ salt = os.urandom(16) # derive -kdf = PBKDF2HMAC( # Noncompliant {{(PasswordBasedKeyDerivationFunction) PBKDF2-SHA256}} +kdf = PBKDF2HMAC( # Noncompliant {{(PasswordBasedKeyDerivationFunction) PBKDF2-SHA-256}} algorithm=hashes.SHA256(), length=32, salt=salt, diff --git a/python/src/test/files/rules/detection/mac/PycaHMACTestFile.py b/python/src/test/files/rules/detection/mac/PycaHMACTestFile.py index 948064f7..70490920 100644 --- a/python/src/test/files/rules/detection/mac/PycaHMACTestFile.py +++ b/python/src/test/files/rules/detection/mac/PycaHMACTestFile.py @@ -6,7 +6,7 @@ def generate_hmac(key, data): algorithm = hashes.SHA256() # Creating the HMAC context - hmac_ctx = hmac.HMAC(key, algorithm) # Noncompliant {{(Mac) HMAC-SHA256}} + hmac_ctx = hmac.HMAC(key, algorithm) # Noncompliant {{(Mac) HMAC-SHA-256}} # Updating the context with the data hmac_ctx.update(data) diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/aead/PycaChaCha20Poly1305Test.java b/python/src/test/java/com/ibm/plugin/rules/detection/aead/PycaChaCha20Poly1305Test.java index 2c704373..004201c3 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/aead/PycaChaCha20Poly1305Test.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/aead/PycaChaCha20Poly1305Test.java @@ -117,7 +117,7 @@ public void asserts( secretKeyNode.getChildren().get(AuthenticatedEncryption.class); assertThat(authenticatedEncryptionNode).isNotNull(); assertThat(authenticatedEncryptionNode.getChildren()).hasSize(1); - assertThat(authenticatedEncryptionNode.asString()).isEqualTo("ChaCha20Poly1305"); + assertThat(authenticatedEncryptionNode.asString()).isEqualTo("ChaCha20-Poly1305"); // MessageDigest under AuthenticatedEncryption under SecretKey INode messageDigestNode = diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DSA/PycaDSASignTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DSA/PycaDSASignTest.java index 2619bb25..a211048e 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DSA/PycaDSASignTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DSA/PycaDSASignTest.java @@ -103,7 +103,7 @@ public void asserts( INode signatureNode = privateKeyNode.getChildren().get(Signature.class); assertThat(signatureNode).isNotNull(); assertThat(signatureNode.getChildren()).hasSize(2); - assertThat(signatureNode.asString()).isEqualTo("SHA256withDSA"); + assertThat(signatureNode.asString()).isEqualTo("SHA-256withDSA"); // Oid under Signature under PrivateKey INode oidNode = signatureNode.getChildren().get(Oid.class); @@ -115,7 +115,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under Signature under PrivateKey INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanGenerateTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanGenerateTest.java index 9ad6a2cc..06ce4401 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanGenerateTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanGenerateTest.java @@ -76,7 +76,7 @@ public void asserts( INode privateKeyNode = nodes.get(0); assertThat(privateKeyNode.getKind()).isEqualTo(PrivateKey.class); assertThat(privateKeyNode.getChildren()).hasSize(2); - assertThat(privateKeyNode.asString()).isEqualTo("DH"); + assertThat(privateKeyNode.asString()).isEqualTo("FFDH"); // KeyGeneration under PrivateKey INode keyGenerationNode = privateKeyNode.getChildren().get(KeyGeneration.class); @@ -88,7 +88,7 @@ public void asserts( INode publicKeyEncryptionNode = privateKeyNode.getChildren().get(PublicKeyEncryption.class); assertThat(publicKeyEncryptionNode).isNotNull(); assertThat(publicKeyEncryptionNode.getChildren()).hasSize(1); - assertThat(publicKeyEncryptionNode.asString()).isEqualTo("DH"); + assertThat(publicKeyEncryptionNode.asString()).isEqualTo("FFDH"); // Oid under PublicKeyEncryption under PrivateKey INode oidNode = publicKeyEncryptionNode.getChildren().get(Oid.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanNumbersTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanNumbersTest.java index 335cb435..bdd8bf7d 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanNumbersTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/DiffieHellman/PycaDiffieHellmanNumbersTest.java @@ -72,14 +72,14 @@ public void asserts( INode publicKeyNode1 = nodes.get(0); assertThat(publicKeyNode1.getKind()).isEqualTo(PublicKey.class); assertThat(publicKeyNode1.getChildren()).hasSize(2); - assertThat(publicKeyNode1.asString()).isEqualTo("DH"); + assertThat(publicKeyNode1.asString()).isEqualTo("FFDH"); // PublicKeyEncryption under PublicKey INode publicKeyEncryptionNode1 = publicKeyNode1.getChildren().get(PublicKeyEncryption.class); assertThat(publicKeyEncryptionNode1).isNotNull(); assertThat(publicKeyEncryptionNode1.getChildren()).hasSize(1); - assertThat(publicKeyEncryptionNode1.asString()).isEqualTo("DH"); + assertThat(publicKeyEncryptionNode1.asString()).isEqualTo("FFDH"); // Oid under PublicKeyEncryption under PublicKey INode oidNode1 = publicKeyEncryptionNode1.getChildren().get(Oid.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveKeyExchangeTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveKeyExchangeTest.java index 2b1b3139..ca421610 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveKeyExchangeTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveKeyExchangeTest.java @@ -156,7 +156,7 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(3); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // KeyDerivation under KeyDerivationFunction INode keyDerivationNode = @@ -176,7 +176,7 @@ public void asserts( keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under KeyDerivationFunction INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSign2Test.java b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSign2Test.java index ad6b5740..c6156730 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSign2Test.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSign2Test.java @@ -91,7 +91,7 @@ public void asserts( INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-512"); // Oid under MessageDigest under Signature under PrivateKey INode oidNode = messageDigestNode.getChildren().get(Oid.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSignTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSignTest.java index dab7cc98..897eac48 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSignTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/EllipticCurve/PycaEllipticCurveSignTest.java @@ -99,13 +99,13 @@ public void asserts( INode signatureNode = privateKeyNode.getChildren().get(Signature.class); assertThat(signatureNode).isNotNull(); assertThat(signatureNode.getChildren()).hasSize(3); - assertThat(signatureNode.asString()).isEqualTo("SHA3-512withECDSA"); + assertThat(signatureNode.asString()).isEqualTo("SHA-3-512withECDSA"); // MessageDigest under Signature under PrivateKey INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3-512"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3-512"); // BlockSize under MessageDigest under Signature under PrivateKey INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSADecryptTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSADecryptTest.java index eadd8e4b..416e98ba 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSADecryptTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSADecryptTest.java @@ -161,7 +161,7 @@ public void asserts( INode messageDigestNode = paddingNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Oid under MessageDigest under Padding under Signature under PrivateKey INode oidNode1 = messageDigestNode.getChildren().get(Oid.class); @@ -206,7 +206,7 @@ public void asserts( maskGenerationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode1).isNotNull(); assertThat(messageDigestNode1.getChildren()).hasSize(4); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA384"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-384"); // Oid under MessageDigest under MaskGenerationFunction under Padding under Signature // under PrivateKey diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSASign1Test.java b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSASign1Test.java index e0702956..e57bdb78 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSASign1Test.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSASign1Test.java @@ -135,7 +135,7 @@ public void asserts( privateKeyNode.getChildren().get(ProbabilisticSignatureScheme.class); assertThat(probabilisticSignatureSchemeNode).isNotNull(); assertThat(probabilisticSignatureSchemeNode.getChildren()).hasSize(3); - assertThat(probabilisticSignatureSchemeNode.asString()).isEqualTo("RSASSA-PSS"); + assertThat(probabilisticSignatureSchemeNode.asString()).isEqualTo("RSA-PSS"); // MaskGenerationFunction under ProbabilisticSignatureScheme under PrivateKey INode maskGenerationFunctionNode = @@ -149,7 +149,7 @@ public void asserts( INode messageDigestNode = maskGenerationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under MaskGenerationFunction under // ProbabilisticSignatureScheme under PrivateKey @@ -190,7 +190,7 @@ public void asserts( probabilisticSignatureSchemeNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode1).isNotNull(); assertThat(messageDigestNode1.getChildren()).hasSize(4); - assertThat(messageDigestNode1.asString()).isEqualTo("SHA384"); + assertThat(messageDigestNode1.asString()).isEqualTo("SHA-384"); // BlockSize under MessageDigest under ProbabilisticSignatureScheme under PrivateKey INode blockSizeNode1 = messageDigestNode1.getChildren().get(BlockSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSASign2Test.java b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSASign2Test.java index 73ddcdaa..16f33535 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSASign2Test.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/asymmetric/RSA/PycaRSASign2Test.java @@ -129,13 +129,13 @@ public void asserts( INode signatureNode = privateKeyNode.getChildren().get(Signature.class); assertThat(signatureNode).isNotNull(); assertThat(signatureNode.getChildren()).hasSize(2); - assertThat(signatureNode.asString()).isEqualTo("SHA3-384withRSA"); + assertThat(signatureNode.asString()).isEqualTo("SHA-3-384withRSA"); // MessageDigest under Signature under PrivateKey INode messageDigestNode = signatureNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA3-384"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-3-384"); // DigestSize under MessageDigest under Signature under PrivateKey INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaFernetDecryptTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaFernetDecryptTest.java index ef67bd98..fafc0e23 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaFernetDecryptTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaFernetDecryptTest.java @@ -117,13 +117,13 @@ public void asserts( INode macNode = authenticatedEncryptionNode.getChildren().get(Mac.class); assertThat(macNode).isNotNull(); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // MessageDigest under Mac under AuthenticatedEncryption under SecretKey INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under Mac under AuthenticatedEncryption under SecretKey INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaFernetEncryptTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaFernetEncryptTest.java index c8cf5d32..b000eb43 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaFernetEncryptTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaFernetEncryptTest.java @@ -117,13 +117,13 @@ public void asserts( INode macNode = authenticatedEncryptionNode.getChildren().get(Mac.class); assertThat(macNode).isNotNull(); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // MessageDigest under Mac under AuthenticatedEncryption under SecretKey INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under Mac under AuthenticatedEncryption under SecretKey INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaMultiFernetTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaMultiFernetTest.java index 3885a733..b5e0b331 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaMultiFernetTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/fernet/PycaMultiFernetTest.java @@ -151,7 +151,7 @@ public void asserts( INode macNode = authenticatedEncryptionNode.getChildren().get(Mac.class); assertThat(macNode).isNotNull(); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // Tag under Mac under AuthenticatedEncryption under SecretKey INode tagNode = macNode.getChildren().get(Tag.class); @@ -169,7 +169,7 @@ public void asserts( INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under Mac under AuthenticatedEncryption under SecretKey INode blockSizeNode1 = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaConcatKDFHMACTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaConcatKDFHMACTest.java index 81bb2d9e..4c72b5be 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaConcatKDFHMACTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaConcatKDFHMACTest.java @@ -92,7 +92,7 @@ public void asserts( INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under Mac INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaConcatKDFHashTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaConcatKDFHashTest.java index 80f0fc5e..68a47dbc 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaConcatKDFHashTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaConcatKDFHashTest.java @@ -90,7 +90,7 @@ public void asserts( INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under KeyDerivationFunction INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaHKDFExpandTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaHKDFExpandTest.java index 5b35fd3c..0eade96a 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaHKDFExpandTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaHKDFExpandTest.java @@ -86,7 +86,7 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(3); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // KeyDerivation under KeyDerivationFunction INode keyDerivationNode = keyDerivationFunctionNode.getChildren().get(KeyDerivation.class); @@ -104,7 +104,7 @@ public void asserts( INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under KeyDerivationFunction INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaHKDFTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaHKDFTest.java index af0c9ea7..e7a4a5f1 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaHKDFTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaHKDFTest.java @@ -85,13 +85,13 @@ public void asserts( INode keyDerivationFunctionNode = nodes.get(0); assertThat(keyDerivationFunctionNode.getKind()).isEqualTo(KeyDerivationFunction.class); assertThat(keyDerivationFunctionNode.getChildren()).hasSize(3); - assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA256"); + assertThat(keyDerivationFunctionNode.asString()).isEqualTo("HKDF-SHA-256"); // MessageDigest under KeyDerivationFunction INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // DigestSize under MessageDigest under KeyDerivationFunction INode digestSizeNode = messageDigestNode.getChildren().get(DigestSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaKBKDFHMACTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaKBKDFHMACTest.java index b797dc1c..ef0fad6b 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaKBKDFHMACTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaKBKDFHMACTest.java @@ -98,7 +98,7 @@ public void asserts( INode macNode = nodes.get(0); assertThat(macNode.getKind()).isEqualTo(Mac.class); assertThat(macNode.getChildren()).hasSize(5); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // Tag under Mac INode tagNode = macNode.getChildren().get(Tag.class); @@ -128,7 +128,7 @@ public void asserts( INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(5); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Mode under MessageDigest under Mac INode modeNode = messageDigestNode.getChildren().get(Mode.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaPBKDF2Test.java b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaPBKDF2Test.java index 4a75a083..bdcc9af1 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaPBKDF2Test.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaPBKDF2Test.java @@ -97,7 +97,7 @@ public void asserts( assertThat(passwordBasedKeyDerivationFunctionNode.getKind()) .isEqualTo(PasswordBasedKeyDerivationFunction.class); assertThat(passwordBasedKeyDerivationFunctionNode.getChildren()).hasSize(3); - assertThat(passwordBasedKeyDerivationFunctionNode.asString()).isEqualTo("PBKDF2-SHA256"); + assertThat(passwordBasedKeyDerivationFunctionNode.asString()).isEqualTo("PBKDF2-SHA-256"); // KeyDerivation under PasswordBasedKeyDerivationFunction INode keyDerivationNode = @@ -111,7 +111,7 @@ public void asserts( passwordBasedKeyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under PasswordBasedKeyDerivationFunction INode digestNode = messageDigestNode.getChildren().get(Digest.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaX963KDFTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaX963KDFTest.java index fd54b75f..e0c41397 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaX963KDFTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/kdf/PycaX963KDFTest.java @@ -104,7 +104,7 @@ public void asserts( INode messageDigestNode = keyDerivationFunctionNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // BlockSize under MessageDigest under KeyDerivationFunction INode blockSizeNode = messageDigestNode.getChildren().get(BlockSize.class); diff --git a/python/src/test/java/com/ibm/plugin/rules/detection/mac/PycaHMACTest.java b/python/src/test/java/com/ibm/plugin/rules/detection/mac/PycaHMACTest.java index 55c11e77..9957f538 100644 --- a/python/src/test/java/com/ibm/plugin/rules/detection/mac/PycaHMACTest.java +++ b/python/src/test/java/com/ibm/plugin/rules/detection/mac/PycaHMACTest.java @@ -74,13 +74,13 @@ public void asserts( INode macNode = nodes.get(0); assertThat(macNode.getKind()).isEqualTo(Mac.class); assertThat(macNode.getChildren()).hasSize(3); - assertThat(macNode.asString()).isEqualTo("HMAC-SHA256"); + assertThat(macNode.asString()).isEqualTo("HMAC-SHA-256"); // MessageDigest under Mac INode messageDigestNode = macNode.getChildren().get(MessageDigest.class); assertThat(messageDigestNode).isNotNull(); assertThat(messageDigestNode.getChildren()).hasSize(4); - assertThat(messageDigestNode.asString()).isEqualTo("SHA256"); + assertThat(messageDigestNode.asString()).isEqualTo("SHA-256"); // Digest under MessageDigest under Mac INode digestNode = messageDigestNode.getChildren().get(Digest.class);