Java 5 compatibilty updates.

bcgit · Jun 19, 2023 · 54cac17 · 54cac17
1 parent a9da560
commit 54cac17
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/pkix/src/test/java/org/bouncycastle/est/test/ESTResponseTest.java b/pkix/src/test/java/org/bouncycastle/est/test/ESTResponseTest.java
@@ -6,8 +6,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -16,6 +14,8 @@
 import junit.framework.TestCase;
 import org.bouncycastle.est.ESTResponse;
 import org.bouncycastle.est.Source;
+import org.bouncycastle.util.Strings;
+import org.bouncycastle.util.encoders.Base64;
 import org.bouncycastle.util.io.Streams;
 
 public class ESTResponseTest
@@ -98,7 +98,7 @@ public void assertESTResponseMessageEquals(String expected, ESTResponse response
         try
         {
             byte[] data = Streams.readAll(response.getInputStream());
-            String dataString = new String(data, StandardCharsets.UTF_8);
+            String dataString = Strings.fromUTF8ByteArray(data);
             assertEquals(expected, dataString);
         }
         catch (IOException e)
@@ -145,7 +145,7 @@ public void testESTResponseShouldSupportContentTransferEncodingBase64()
         throws IOException
     {
         String data = "Test message body";
-        String dataBase64 = Base64.getEncoder().encodeToString(data.getBytes(StandardCharsets.UTF_8));
+        String dataBase64 = Base64.toBase64String(Strings.toUTF8ByteArray(data));
 
         Map<String, String> httpHeader = new HashMap<String, String>();
         httpHeader.put("content-transfer-encoding", "base64");
@@ -207,7 +207,7 @@ public void testESTResponseMustNotThrowOnChunkedTransferEncodingWithContentTrans
         throws IOException
     {
         String data = "Test message body";
-        String dataBase64 = Base64.getEncoder().encodeToString(data.getBytes(StandardCharsets.UTF_8));
+        String dataBase64 = Base64.toBase64String(Strings.toUTF8ByteArray(data));
 
         Map<String, String> httpHeader = new HashMap<String, String>();
         httpHeader.put("content-transfer-encoding", "base64");

diff --git a/prov/src/test/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java b/prov/src/test/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java
@@ -2108,6 +2108,11 @@ public String getName()
     private void testJKS()
         throws Exception
     {
+        if (System.getProperty("java.version").indexOf("1.5.") == 0)
+        {
+            return;
+        }
+
         KeyStore ks = KeyStore.getInstance("PKCS12", BC);
 
         ks.load(new ByteArrayInputStream(JKS_Store), JKS_TEST_PWD);