fix pbe keylength interpretation; update tests (#233)

Signed-off-by: Nicklas Körtge <nicklas.koertge1@ibm.com>

Author: n1ckl0sk0rtge

java/src/main/java/com/ibm/plugin/rules/detection/jca/keyspec/JcaPBEKeySpec.java

@@ -22,6 +22,7 @@
 import static com.ibm.plugin.rules.detection.TypeShortcuts.BYTE_ARRAY_TYPE;
 import static com.ibm.plugin.rules.detection.TypeShortcuts.CHAR_ARRAY_TYPE;
 
+import com.ibm.engine.model.Size;
 import com.ibm.engine.model.context.KeyContext;
 import com.ibm.engine.model.context.SecretKeyContext;
 import com.ibm.engine.model.factory.KeySizeFactory;
@@ -72,7 +73,7 @@ public final class JcaPBEKeySpec {
                     .shouldBeDetectedAs(new SaltSizeFactory<>())
                     .withMethodParameter("int")
                     .withMethodParameter("int")
-                    .shouldBeDetectedAs(new KeySizeFactory<>())
+                    .shouldBeDetectedAs(new KeySizeFactory<>(Size.UnitType.BIT))
                     .buildForContext(new SecretKeyContext(KeyContext.Kind.PBE))
                     .inBundle(() -> "Jca")
                     .withoutDependingDetectionRules();

java/src/test/java/com/ibm/plugin/rules/detection/jca/algorithmspec/JcaGCMParameterSpecTest.java

@@ -110,7 +110,7 @@ public void asserts(
 
             IValue<Tree> value2_1_1 = store_1_1.getDetectionValues().get(2);
             assertThat(value2_1_1).isInstanceOf(KeySize.class);
-            assertThat(value2_1_1.asString()).isEqualTo("2048");
+            assertThat(value2_1_1.asString()).isEqualTo("256");
 
             /*
              * Translation
@@ -200,7 +200,7 @@ public void asserts(
             INode keyLengthNode = secretKeyNode.getChildren().get(KeyLength.class);
             assertThat(keyLengthNode).isNotNull();
             assertThat(keyLengthNode.getChildren()).isEmpty();
-            assertThat(keyLengthNode.asString()).isEqualTo("2048");
+            assertThat(keyLengthNode.asString()).isEqualTo("256");
         } else if (findingId == 1) {
             /*
              * Detection Store

java/src/test/java/com/ibm/plugin/rules/detection/jca/keyspec/JcaPBEKeySpecTest.java

@@ -90,7 +90,7 @@ public void asserts(
                 .anyMatch(
                         v -> {
                             if (v instanceof KeySize<Tree>) {
-                                return v.asString().equals("1024");
+                                return v.asString().equals("128");
                             } else if (v instanceof SaltSize<Tree>) {
                                 return v.asString().equals("192");
                             } else if (v instanceof PasswordSize<Tree>) {
@@ -114,7 +114,7 @@ public void asserts(
         INode keyLengthNode = secretKeyNode.getChildren().get(KeyLength.class);
         assertThat(keyLengthNode).isNotNull();
         assertThat(keyLengthNode.getChildren()).isEmpty();
-        assertThat(keyLengthNode.asString()).isEqualTo("1024");
+        assertThat(keyLengthNode.asString()).isEqualTo("128");
 
         // PasswordBasedKeyDerivationFunction under SecretKey
         INode passwordBasedKeyDerivationFunctionNode =