Use standard Base64 instead of commons-codec version.

mwiede · Jan 25, 2023 · ba68ebb · ba68ebb
1 parent efe4328
commit ba68ebb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/src/test/java/com/jcraft/jsch/AbstractBufferMargin.java b/src/test/java/com/jcraft/jsch/AbstractBufferMargin.java
@@ -1,7 +1,6 @@
 package com.jcraft.jsch;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.codec.binary.Base64.decodeBase64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.github.valfirst.slf4jtest.LoggingEvent;
@@ -14,6 +13,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Base64;
 import java.util.List;
 import java.util.Random;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -144,7 +144,7 @@ private HostKey readHostKey(String fileName) throws Exception {
     List<String> lines = Files.readAllLines(Paths.get(fileName), UTF_8);
     String[] split = lines.get(0).split("\\s+");
     String hostname = String.format("[%s]:%d", sshd.getHost(), sshd.getFirstMappedPort());
-    return new HostKey(hostname, decodeBase64(split[1]));
+    return new HostKey(hostname, Base64.getDecoder().decode(split[1]));
   }
 
   private Session createSession(JSch ssh) throws Exception {

diff --git a/src/test/java/com/jcraft/jsch/Algorithms2IT.java b/src/test/java/com/jcraft/jsch/Algorithms2IT.java
@@ -1,7 +1,6 @@
 package com.jcraft.jsch;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.codec.binary.Base64.decodeBase64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.condition.JRE.JAVA_11;
@@ -15,6 +14,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
@@ -362,7 +362,7 @@ private HostKey readHostKey(String fileName) throws Exception {
     List<String> lines = Files.readAllLines(Paths.get(fileName), UTF_8);
     String[] split = lines.get(0).split("\\s+");
     String hostname = String.format("[%s]:%d", sshd.getHost(), sshd.getFirstMappedPort());
-    return new HostKey(hostname, decodeBase64(split[1]));
+    return new HostKey(hostname, Base64.getDecoder().decode(split[1]));
   }
 
   private Session createSession(JSch ssh) throws Exception {

diff --git a/src/test/java/com/jcraft/jsch/Algorithms3IT.java b/src/test/java/com/jcraft/jsch/Algorithms3IT.java
@@ -1,7 +1,6 @@
 package com.jcraft.jsch;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.codec.binary.Base64.decodeBase64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -13,6 +12,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
@@ -116,7 +116,7 @@ private HostKey readHostKey(String fileName) throws Exception {
     List<String> lines = Files.readAllLines(Paths.get(fileName), UTF_8);
     String[] split = lines.get(0).split("\\s+");
     String hostname = String.format("[%s]:%d", sshd.getHost(), sshd.getFirstMappedPort());
-    return new HostKey(hostname, decodeBase64(split[1]));
+    return new HostKey(hostname, Base64.getDecoder().decode(split[1]));
   }
 
   private Session createSession(JSch ssh) throws Exception {

diff --git a/src/test/java/com/jcraft/jsch/AlgorithmsIT.java b/src/test/java/com/jcraft/jsch/AlgorithmsIT.java
@@ -2,7 +2,6 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.toList;
-import static org.apache.commons.codec.binary.Base64.decodeBase64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.condition.JRE.JAVA_11;
@@ -17,6 +16,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
@@ -530,7 +530,7 @@ private HostKey readHostKey(String fileName) throws Exception {
     List<String> lines = Files.readAllLines(Paths.get(fileName), UTF_8);
     String[] split = lines.get(0).split("\\s+");
     String hostname = String.format("[%s]:%d", sshd.getHost(), sshd.getFirstMappedPort());
-    return new HostKey(hostname, decodeBase64(split[1]));
+    return new HostKey(hostname, Base64.getDecoder().decode(split[1]));
   }
 
   private Session createSession(JSch ssh) throws Exception {

diff --git a/src/test/java/com/jcraft/jsch/JSchAlgoNegoFailExceptionIT.java b/src/test/java/com/jcraft/jsch/JSchAlgoNegoFailExceptionIT.java
@@ -1,12 +1,12 @@
 package com.jcraft.jsch;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.codec.binary.Base64.decodeBase64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Base64;
 import java.util.List;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -96,7 +96,7 @@ private HostKey readHostKey(String fileName) throws Exception {
     List<String> lines = Files.readAllLines(Paths.get(fileName), UTF_8);
     String[] split = lines.get(0).split("\\s+");
     String hostname = String.format("[%s]:%d", sshd.getHost(), sshd.getFirstMappedPort());
-    return new HostKey(hostname, decodeBase64(split[1]));
+    return new HostKey(hostname, Base64.getDecoder().decode(split[1]));
   }
 
   private Session createSession(JSch ssh) throws Exception {

diff --git a/src/test/java/com/jcraft/jsch/OpenSSH74ServerSigAlgsIT.java b/src/test/java/com/jcraft/jsch/OpenSSH74ServerSigAlgsIT.java
@@ -1,7 +1,6 @@
 package com.jcraft.jsch;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.codec.binary.Base64.decodeBase64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -13,6 +12,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
@@ -149,7 +149,7 @@ private HostKey readHostKey(String fileName) throws Exception {
     List<String> lines = Files.readAllLines(Paths.get(fileName), UTF_8);
     String[] split = lines.get(0).split("\\s+");
     String hostname = String.format("[%s]:%d", sshd.getHost(), sshd.getFirstMappedPort());
-    return new HostKey(hostname, decodeBase64(split[1]));
+    return new HostKey(hostname, Base64.getDecoder().decode(split[1]));
   }
 
   private Session createSession(JSch ssh) throws Exception {

diff --git a/src/test/java/com/jcraft/jsch/SSHAgentIT.java b/src/test/java/com/jcraft/jsch/SSHAgentIT.java
@@ -1,7 +1,6 @@
 package com.jcraft.jsch;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.codec.binary.Base64.decodeBase64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.condition.JRE.JAVA_16;
@@ -17,6 +16,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Base64;
 import java.util.List;
 import java.util.Random;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -362,7 +362,7 @@ private HostKey readHostKey(String fileName) throws Exception {
     List<String> lines = Files.readAllLines(Paths.get(fileName), UTF_8);
     String[] split = lines.get(0).split("\\s+");
     String hostname = String.format("[%s]:%d", sshd.getHost(), sshd.getFirstMappedPort());
-    return new HostKey(hostname, decodeBase64(split[1]));
+    return new HostKey(hostname, Base64.getDecoder().decode(split[1]));
   }
 
   private Session createSession(JSch ssh) throws Exception {

diff --git a/src/test/java/com/jcraft/jsch/ServerSigAlgsIT.java b/src/test/java/com/jcraft/jsch/ServerSigAlgsIT.java
@@ -1,7 +1,6 @@
 package com.jcraft.jsch;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.commons.codec.binary.Base64.decodeBase64;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -13,6 +12,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
@@ -173,7 +173,7 @@ private HostKey readHostKey(String fileName) throws Exception {
     List<String> lines = Files.readAllLines(Paths.get(fileName), UTF_8);
     String[] split = lines.get(0).split("\\s+");
     String hostname = String.format("[%s]:%d", sshd.getHost(), sshd.getFirstMappedPort());
-    return new HostKey(hostname, decodeBase64(split[1]));
+    return new HostKey(hostname, Base64.getDecoder().decode(split[1]));
   }
 
   private Session createSession(JSch ssh) throws Exception {