key handling simplified

jalauros · jalauros · commit 4811c2c9317d · 2018-11-25T19:52:46.000+02:00
diff --git a/src/test/java/org/oidc/msg/AbstractMessageTest.java b/src/test/java/org/oidc/msg/AbstractMessageTest.java
@@ -164,15 +164,9 @@ private void testSuccessJWTEncryptDecrypt(String alg, String encAlg, String encE
     List<Key> keysDec = getKeyJar().getDecryptKey(null, keyOwner, null, null);
     List<Key> keysEnc = getKeyJarPub().getEncryptKey(null, keyOwner, null, null);
     String signedAndEncryptedJwt = null;
-    if (encAlg.equals("A128KW")) {
+    if (encAlg.startsWith("A")) {
       signedAndEncryptedJwt = mockMessage.toJwt(keysDec.get(0), alg, keysEnc.get(1), encAlg,
           encEnc, null, null, null);
-    } else if (encAlg.equals("A192KW")) {
-      signedAndEncryptedJwt = mockMessage.toJwt(keysDec.get(0), alg, keysEnc.get(2), encAlg,
-          encEnc, null, null, null);
-    } else if (encAlg.equals("A256KW")) {
-      signedAndEncryptedJwt = mockMessage.toJwt(keysDec.get(0), alg, keysEnc.get(3), encAlg,
-          encEnc, null, null, null);
     } else if (encAlg.startsWith("ECDH")) {
       
       //For ECDH we need to do bit more complicated test
diff --git a/src/test/java/org/oidc/msg/BaseMessageTest.java b/src/test/java/org/oidc/msg/BaseMessageTest.java
@@ -174,12 +174,7 @@ protected KeyJar getKeyJar()
     KeyBundle keyBundlePrv = KeyBundle.keyBundleFromLocalFile(PRIVATE_KEY_FILE, "der", usesPrv);
     keyJarOfPrivateKeys.addKeyBundle(keyOwner, keyBundlePrv);
     keyJarOfPrivateKeys.addKeyBundle("", keyBundlePrv);
-    keyBundlePrv.append(new SYMKey("enc", Base64.encodeBase64URLSafeString(
-        "1234567890123456".getBytes(Charset.forName("UTF-8")))));
-    keyBundlePrv.append(new SYMKey("enc", Base64.encodeBase64URLSafeString(
-        "123456789012345678901234".getBytes(Charset.forName("UTF-8")))));
-    keyBundlePrv.append(new SYMKey("enc", Base64.encodeBase64URLSafeString(
-        "12345678901234567890123456789012".getBytes(Charset.forName("UTF-8")))));
+    keyBundlePrv.append(new SYMKey("enc", "symmetrickey"));
     ArrayList<String> usesPub = new ArrayList<String>();
     usesPub.add("ver");
     usesPub.add("enc");
@@ -207,12 +202,7 @@ protected KeyJar getKeyJarPub()
     usesPub.add("ver");
     usesPub.add("enc");
     KeyBundle keyBundlePub = KeyBundle.keyBundleFromLocalFile(PUBLIC_KEY_FILE, "der", usesPub);
-    keyBundlePub.append(new SYMKey("enc", Base64.encodeBase64URLSafeString(
-        "1234567890123456".getBytes(Charset.forName("UTF-8")))));
-    keyBundlePub.append(new SYMKey("enc", Base64.encodeBase64URLSafeString(
-        "123456789012345678901234".getBytes(Charset.forName("UTF-8")))));
-    keyBundlePub.append(new SYMKey("enc", Base64.encodeBase64URLSafeString(
-        "12345678901234567890123456789012".getBytes(Charset.forName("UTF-8")))));
+    keyBundlePub.append(new SYMKey("enc", "symmetrickey"));
     keyJarOfPublicKeys.addKeyBundle(keyOwner, keyBundlePub);
     return keyJarOfPublicKeys;
   }
