Align the DEMOs with the wording used elsewhere.

Author: sydseter

demos/android/MASVS-CRYPTO/MASTG-DEMO-0012/MASTG-DEMO-0012.md

@@ -1,6 +1,6 @@
 ---
 platform: android
-title: Weak Cryptographic Key Generation
+title: Cryptographic Key Generation With Insufficient Key Length
 code: [java]
 id: MASTG-DEMO-0012
 test: MASTG-TEST-0208
@@ -14,7 +14,7 @@ test: MASTG-TEST-0208
 
 Let's run our @MASTG-TOOL-0110 rule against the sample code.
 
-{{ ../../../../rules/mastg-android-weak-key-generation.yml }}
+{{ ../../../../rules/mastg-android-key-generation-with-insufficient-key-length.yml }}
 
 {{ run.sh }}
 
@@ -26,4 +26,4 @@ The rule has identified some instances in the code file where cryptographic keys
 
 ### Evaluation
 
-The test fails because the key size of the RSA key is set to `1024` bits, and the size of the AES key is set to `128`, which is considered weak in both cases.
+The test fails because the key size of the RSA key is set to `1024` bits, and the size of the AES key is set to `128`, which is considered insufficient in both cases.

demos/android/MASVS-CRYPTO/MASTG-DEMO-0012/output.txt

@@ -5,7 +5,7 @@
 └─────────────────┘
 
     MastgTest_reversed.java
-    ❯❱ weak_key_size
+    ❯❱ insufficient_key_size
           Cryptographic implementations with insufficient key length are being used.
 
            27┆ KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");

demos/android/MASVS-CRYPTO/MASTG-DEMO-0012/run.sh

@@ -1 +1 @@
-NO_COLOR=true semgrep -c ../../../../rules/mastg-android-weak-key-generation.yml ./MastgTest_reversed.java --text -o output.txt
+NO_COLOR=true semgrep -c ../../../../rules/mastg-android-key-generation-with-insufficient-key-length.yml ./MastgTest_reversed.java --text -o output.txt

demos/android/MASVS-CRYPTO/MASTG-DEMO-0022/MASTG-DEMO-0022.md

@@ -1,6 +1,6 @@
 ---
 platform: android
-title: Uses of Insecure Symmetric Encryption Algorithms in Cipher with semgrep
+title: Uses of Deprecated, Risky or Broken Symmetric Encryption Algorithms in Cipher with semgrep
 id: MASTG-DEMO-0022
 code: [kotlin]
 test: MASTG-TEST-0221
@@ -16,18 +16,18 @@ The code snippet below shows sample code contains use of insecure encryption alg
 
 Let's run our @MASTG-TOOL-0110 rule against the sample code.
 
-{{ ../../../../rules/mastg-android-weak-encryption-algorithms.yaml }}
+{{ ../../../../rules/mastg-android-risky-encryption-algorithms.yaml }}
 
 {{ run.sh }}
 
 ### Observation
 
-The rule has identified two instances in the code file where insecure encryption algorithms are used. The specified line numbers can be located in the reverse-engineered code for further investigation and remediation.
+The rule has identified two instances in the code file where deprecated, risky or broken encryption algorithms are used. The specified line numbers can be located in the reverse-engineered code for further investigation and remediation.
 
 {{ output.txt }}
 
 ### Evaluation
 
-The test fails due to the use of weak encryption algorithms, specifically DES, 3DES, RC4 and Blowfish.
+The test fails due to the use of deprecated, risky or broken encryption algorithms, specifically DES, 3DES, RC4 and Blowfish.
 
 See @MASTG-TEST-0221 for more information.

demos/android/MASVS-CRYPTO/MASTG-DEMO-0022/MastgTest.kt

@@ -13,7 +13,7 @@ import javax.crypto.SecretKey
 
 class MastgTest(private val context: Context) {
 
-    // Vulnerable encryption using DES (weak algorithm)
+    // Vulnerable encryption using DES (broken algorithm)
     fun vulnerableDesEncryption(data: String): String {
         try {
             // Weak key for DES
@@ -23,7 +23,7 @@ class MastgTest(private val context: Context) {
             val keyFactory = SecretKeyFactory.getInstance("DES")
             val secretKey: Key = keyFactory.generateSecret(keySpec)
 
-            // Weak encryption algorithm (DES)
+            // Risky encryption algorithm (DES)
             val cipher = Cipher.getInstance("DES")
             cipher.init(Cipher.ENCRYPT_MODE, secretKey)
 
@@ -44,7 +44,7 @@ class MastgTest(private val context: Context) {
             val keyFactory = SecretKeyFactory.getInstance("DESede")
             val secretKey: Key = keyFactory.generateSecret(keySpec)
 
-            // Weak encryption algorithm (3DES)
+            // Risky encryption algorithm (3DES)
             val cipher = Cipher.getInstance("DESede")
             cipher.init(Cipher.ENCRYPT_MODE, secretKey)
 
@@ -72,15 +72,15 @@ class MastgTest(private val context: Context) {
         }
     }
 
-    // Insecure encryption using Blowfish (weak algorithm)
+    // Risky encryption using Blowfish (weak algorithm)
     fun vulnerableBlowfishEncryption(data: String): String {
         return try {
-            // Weak key for Blowfish (insecure, small key size)
+            // Weak key for Blowfish (risky, small key size)
             val keyBytes = ByteArray(8) // Only 8 bytes (64-bit key) - not secure
             SecureRandom().nextBytes(keyBytes)
             val secretKey: SecretKey = SecretKeySpec(keyBytes, "Blowfish")
 
-            // Weak encryption algorithm (Blowfish)
+            // Risky encryption algorithm (Blowfish)
             val cipher = Cipher.getInstance("Blowfish")
             cipher.init(Cipher.ENCRYPT_MODE, secretKey)
 
@@ -95,16 +95,16 @@ class MastgTest(private val context: Context) {
     fun mastgTest(): String {
         val sensitiveString = "Hello from the OWASP MASTG Test app."
 
-        // Encrypt with weak DES
+        // Encrypt with broken DES
         val desEncryptedString = vulnerableDesEncryption(sensitiveString)
 
-        // Encrypt with weak 3DES
+        // Encrypt with risky 3DES
         val tripleDesEncryptedString = vulnerable3DesEncryption(sensitiveString)
 
         // Encrypt with deprecated RC4
         val rc4EncryptedString = vulnerableRc4Encryption(sensitiveString)
 
-        // Encrypt with weak Blowfish
+        // Encrypt with risky Blowfish
         val blowfishEncryptedString = vulnerableBlowfishEncryption(sensitiveString)
 
         // Returning the encrypted results

demos/android/MASVS-CRYPTO/MASTG-DEMO-0022/output.txt

@@ -5,8 +5,8 @@
 └─────────────────┘
 
     MastgTest_reversed.java
-    ❯❱ rules.weak-encryption-algorithms
-          [MASVS-CRYPTO-1] Weak encryption algorithms found in use.
+    ❯❱ rules.risky-encryption-algorithms
+          [MASVS-CRYPTO-1] Deprecated, risky or broken encryption algorithms found in use.
 
            39┆ Cipher cipher = Cipher.getInstance("DES");
             ⋮┆----------------------------------------
@@ -15,4 +15,3 @@
            81┆ Cipher cipher = Cipher.getInstance("RC4");
             ⋮┆----------------------------------------
           100┆ Cipher cipher = Cipher.getInstance("Blowfish");
-

demos/android/MASVS-CRYPTO/MASTG-DEMO-0022/run.sh

@@ -1 +1 @@
-NO_COLOR=true semgrep -c ../../../../rules/mastg-android-weak-encryption-algorithms.yaml ./MastgTest_reversed.java --text > output.txt
+NO_COLOR=true semgrep -c ../../../../rules/mastg-android-risky-encryption-algorithms.yaml ./MastgTest_reversed.java --text > output.txt

demos/android/MASVS-CRYPTO/MASTG-DEMO-0023/MASTG-DEMO-0023.md

@@ -1,28 +1,28 @@
 ---
 platform: android
-title: Uses of Insecure Encryption Modes in Cipher with semgrep
+title: Uses of Risky or Broken Encryption Modes in Cipher with semgrep
 id: MASTG-DEMO-0023
 code: [kotlin]
 test: MASTG-TEST-0232
 ---
 
 ### Sample
 
-The code snippet below shows sample code contains use of insecure encryption modes.
+The code snippet below shows sample code contains use of risky or broken encryption modes.
 
 {{ MastgTest.kt # MastgTest_reversed.java }}
 
 ### Steps
 
 Let's run our @MASTG-TOOL-0110 rule against the sample code.
 
-{{ ../../../../rules/mastg-android-weak-encryption-modes.yaml }}
+{{ ../../../../rules/mastg-android-risky-encryption-modes.yaml }}
 
 {{ run.sh }}
 
 ### Observation
 
-The rule has identified six instances in the code file where insecure encryption modes are used. The specified line numbers can be located in the reverse-engineered code for further investigation and remediation.
+The rule has identified six instances in the code file where risky or broken encryption modes are used. The specified line numbers can be located in the reverse-engineered code for further investigation and remediation.
 
 {{ output.txt }}
 

demos/android/MASVS-CRYPTO/MASTG-DEMO-0023/output.txt

@@ -5,8 +5,8 @@
 └─────────────────┘
 
     MastgTest_reversed.java
-    ❯❱ rules.weak-encryption-modes
-          [MASVS-CRYPTO-1] Weak encryption modes found in use.
+    ❯❱ rules.risky-encryption-modes
+          [MASVS-CRYPTO-1] Risky or broken encryption modes found in use.
 
            36┆ Cipher cipher = Cipher.getInstance("AES");
             ⋮┆----------------------------------------
@@ -19,4 +19,3 @@
           118┆ Cipher cipher = Cipher.getInstance("DES/ECB/PKCS5Padding");
             ⋮┆----------------------------------------
           141┆ Cipher cipher = Cipher.getInstance("DESede/ECB/PKCS5Padding");
-

demos/android/MASVS-CRYPTO/MASTG-DEMO-0023/run.sh

@@ -1 +1 @@
-NO_COLOR=true semgrep -c ../../../../rules/mastg-android-weak-encryption-modes.yaml ./MastgTest_reversed.java --text > output.txt
+NO_COLOR=true semgrep -c ../../../../rules/mastg-android-risky-encryption-modes.yaml ./MastgTest_reversed.java --text > output.txt

demos/ios/MASVS-CRYPTO/MASTG-DEMO-0011/MASTG-DEMO-0011.md

@@ -1,6 +1,6 @@
 ---
 platform: ios
-title: Uses of Weak Key Size in SecKeyCreateRandomKey with r2
+title: Uses of Insufficient Key Size in SecKeyCreateRandomKey with r2
 code: [swift]
 id: MASTG-DEMO-0011
 test: MASTG-TEST-0209
@@ -37,4 +37,4 @@ In the output we can see how the `kSecAttrKeySizeInBits` attribute is set to `10
 
 {{ evaluation.txt }}
 
-The test fails because the key size is set to `1024` bits, which is considered weak for RSA encryption. The key size should be increased to `2048` bits or higher to provide adequate security against modern cryptographic attacks.
+The test fails because the key size is set to `1024` bits, which is considered insufficient for RSA encryption. The key size should be increased to `2048` bits or higher to provide adequate security against modern cryptographic attacks.

demos/ios/MASVS-CRYPTO/MASTG-DEMO-0015/MASTG-DEMO-0015.md

@@ -1,6 +1,6 @@
 ---
 platform: ios
-title: Uses of Insecure Hashing Algorithms in CommonCrypto with r2
+title: Uses of Risky or Broken Hashing Algorithms in CommonCrypto with r2
 code: [swift]
 id: MASTG-DEMO-0015
 test: MASTG-TEST-0211

demos/ios/MASVS-CRYPTO/MASTG-DEMO-0016/MASTG-DEMO-0016.md

@@ -1,6 +1,6 @@
 ---
 platform: ios
-title: Uses of Insecure Hashing Algorithms in CryptoKit with r2
+title: Uses of Risky or Broken Hashing Algorithms in CryptoKit with r2
 code: [swift]
 id: MASTG-DEMO-0016
 test: MASTG-TEST-0211

demos/ios/MASVS-CRYPTO/MASTG-DEMO-0018/MASTG-DEMO-0018.md

@@ -1,6 +1,6 @@
 ---
 platform: ios
-title: Uses of Insecure Encryption Algorithms in CommonCrypto with r2
+title: Uses of Deprecated, Risky or Broken Encryption Algorithms in CommonCrypto with r2
 code: [swift]
 id: MASTG-DEMO-0018
 test: MASTG-TEST-0210

rules/mastg-android-weak-key-generation.yml rules/mastg-android-key-generation-with-insufficient-key-length.yml

@@ -1,5 +1,5 @@
 rules:
-  - id: weak_key_size
+  - id: insufficient_key_size
     severity: WARNING
     languages:
       - java

rules/mastg-android-weak-encryption-algorithms.yaml rules/mastg-android-risky-encryption-algorithms.yaml

@@ -1,5 +1,5 @@
 rules:
-  - id: weak-encryption-algorithms
+  - id: risky-encryption-algorithms
     languages:
       - java
     severity: WARNING

rules/mastg-android-weak-encryption-modes.yaml rules/mastg-android-risky-encryption-modes.yaml

@@ -1,5 +1,5 @@
 rules:
-  - id: weak-encryption-modes
+  - id: risky-encryption-modes
     languages:
       - java
     severity: WARNING