Explicitly provide an AlgorithmParameterSpec for cipher initialization

Bouncy Castle 1.73 and later no longer allows null IES algorithm parameters: https://github.com/bcgit/bc-java/commit/5f7b6e7588737bcfb8f1dac85c03d761dc39f42c

http://sponge2/9c4945bf-871a-4131-ac6e-81353a8599d0 (ok)
http://sponge2/d7ab9ab6-c9b6-4939-b967-36a58ffcb269 (failed)

NOKEYCHECK=True
PiperOrigin-RevId: 565414128

1 files changed, 11 insertions, 2 deletions

diff --git a/java/com/google/security/wycheproof/testcases/DhiesTest.java b/java/com/google/security/wycheproof/testcases/DhiesTest.java
index 7821596..920dd75 100644
--- a/java/com/google/security/wycheproof/testcases/DhiesTest.java
+++ b/java/com/google/security/wycheproof/testcases/DhiesTest.java
@@ -92,8 +92,9 @@ public class DhiesTest {
     String paramsHex;
     switch (algorithmName.toUpperCase(Locale.ENGLISH)) {
       case "DHIES":
-        // No algorithm parameters necessary.
-        return null;
+        // 128-bit HMAC key.
+        paramsHex = "300702020080010100";
+        break;
       case "DHIESWITHAES-CBC":
         // 256-bit AES key, 256-bit HMAC key, all zero nonce
         paramsHex = "301c02020100301602020100041000000000000000000000000000000000";
@@ -167,7 +168,11 @@ public class DhiesTest {
       TestUtil.skipTest(algorithmName + " is not supported");
       return; // fallback for legacy test setups where skipTest does not throw an exception.
     }
+    try {
     dhies.init(Cipher.ENCRYPT_MODE, pub);
+    } catch (IllegalArgumentException e) {
+      TestUtil.skipTest("AlgorithmParameters must be non-null");
+    }
     byte[] ciphertext = dhies.doFinal(message);
     System.out.println(
         algorithmName + " : " + TestUtil.bytesToHex(dhies.getParameters().getEncoded()));
@@ -269,7 +274,11 @@ public class DhiesTest {
         continue;
       }
       byte[] message = new byte[128];
+      try {
       dhies.init(Cipher.ENCRYPT_MODE, pub);
+      } catch (IllegalArgumentException e) {
+        TestUtil.skipTest("AlgorithmParameters must be non-null");
+      }
       byte[] ciphertext = dhies.doFinal(message);
       int blockSize = 16;
       for (int i = 0; i < ciphertext.length - 2 * blockSize + 1; i++) {