replace external library with java native base64 implementation

Author: tk

pom.xml

@@ -62,12 +62,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>net.iharder</groupId>
-			<artifactId>base64</artifactId>
-			<version>2.3.9</version>
-		</dependency>
-
 		<dependency>
 			<groupId>net.markenwerk</groupId>
 			<artifactId>utils-data-fetcher</artifactId>
@@ -244,7 +238,6 @@
 								<dependencySourceInclude>net.markenwerk:*</dependencySourceInclude>
 							</dependencySourceIncludes>
 							<links>
-								<link>http://iharder.sourceforge.net/current/java/base64/api/</link>
 								<link>https://eclipse-ee4j.github.io/mail/docs/api/</link>
 							</links>
 						</configuration>

src/main/java/net/markenwerk/utils/mail/dkim/DkimSigner.java

@@ -34,6 +34,7 @@
 import java.security.interfaces.RSAPrivateKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Enumeration;
@@ -55,7 +56,6 @@
 import com.sun.mail.util.QPEncoderStream;
 
 import net.i2p.crypto.eddsa.EdDSAPrivateKey;
-import net.iharder.Base64;
 import net.markenwerk.utils.data.fetcher.BufferedDataFetcher;
 import net.markenwerk.utils.data.fetcher.DataFetchException;
 
@@ -690,7 +690,7 @@ private static String quotedPrintable(String s) {
    }
 
    private static String base64Encode(byte[] bytes) {
-      String encoded = Base64.encodeBytes(bytes);
+      String encoded = Base64.getEncoder().encodeToString(bytes);
 
       // remove unnecessary line feeds after 76 characters
       encoded = encoded.replace("\n", "");

src/main/java/net/markenwerk/utils/mail/dkim/DomainKey.java

@@ -17,7 +17,6 @@
  */
 package net.markenwerk.utils.mail.dkim;
 
-import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
 import java.security.NoSuchAlgorithmException;
@@ -29,6 +28,7 @@
 import java.security.interfaces.RSAPublicKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
@@ -39,7 +39,6 @@
 import net.i2p.crypto.eddsa.EdDSAPublicKey;
 import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
 import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
-import net.iharder.Base64;
 
 /**
  * A {@code DomainKey} holds the information about a domain key.
@@ -153,11 +152,11 @@ private PublicKey getPublicKey(String publicKeyTagValue) throws DkimException {
    private RSAPublicKey getRsaPublicKey(String publicKeyTagValue) {
       try {
          KeyFactory keyFactory = KeyFactory.getInstance(KeyPairType.RSA.getJavaNotation());
-         X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(Base64.decode(publicKeyTagValue));
+         X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(Base64.getDecoder().decode(publicKeyTagValue));
          return (RSAPublicKey) keyFactory.generatePublic(publicKeySpec);
       } catch (NoSuchAlgorithmException nsae) {
          throw new DkimException("RSA algorithm not found by JVM");
-      } catch (IOException e) {
+      } catch (IllegalArgumentException e) {
          throw new DkimException("The public key " + publicKeyTagValue + " couldn't be read.", e);
       } catch (InvalidKeySpecException e) {
          throw new DkimException("The public key " + publicKeyTagValue + " couldn't be decoded.", e);
@@ -167,12 +166,12 @@ private RSAPublicKey getRsaPublicKey(String publicKeyTagValue) {
    private EdDSAPublicKey getEd25519PublicKey(String publicKeyTagValue) {
       try {
          KeyFactory keyFactory = KeyFactory.getInstance(KeyPairType.ED25519.getJavaNotation());
-         EdDSAPublicKeySpec publicKeySpec = new EdDSAPublicKeySpec(Base64.decode(publicKeyTagValue),
+         EdDSAPublicKeySpec publicKeySpec = new EdDSAPublicKeySpec(Base64.getDecoder().decode(publicKeyTagValue),
                EdDSANamedCurveTable.ED_25519_CURVE_SPEC);
          return (EdDSAPublicKey) keyFactory.generatePublic(publicKeySpec);
       } catch (NoSuchAlgorithmException nsae) {
          throw new DkimException("Ed25519 algorithm not found by JVM");
-      } catch (IOException e) {
+      } catch (IllegalArgumentException e) {
          throw new DkimException("The public key " + publicKeyTagValue + " couldn't be read.", e);
       } catch (InvalidKeySpecException e) {
          throw new DkimException("The public key " + publicKeyTagValue + " couldn't be decoded.", e);

src/test/java/net/markenwerk/utils/mail/dkim/DomainKeyTest.java

@@ -5,6 +5,7 @@
 import static org.junit.Assert.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -18,8 +19,6 @@
 
 import org.junit.Test;
 
-import net.iharder.Base64;
-
 public class DomainKeyTest {
 
    private static final String EXAMPLE_DOMAIN_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDwIRP/UC3SBsEmGqZ9ZJW3/DkMoGeLnQg1fWn7/zYtIxN2SnFCjxOCKG9v3b4jYfcTNh5ijSsq631uBItLa7od+v/RtdC2UzJ1lWT947qR+Rcac2gbto/NMqJ0fzfVjH4OuKhitdY9tf6mcwGjaNBcWToIMmPSPDdQPNUYckcQ2QIDAQAB";
@@ -37,7 +36,7 @@ public void checkDomainKeyRecognizesPublicKey() throws Exception {
       DomainKey domainKey = new DomainKey(tags);
 
       assertNotNull(domainKey);
-      assertArrayEquals(Base64.decode(EXAMPLE_DOMAIN_KEY), domainKey.getPublicKey().getEncoded());
+      assertArrayEquals(Base64.getDecoder().decode(EXAMPLE_DOMAIN_KEY), domainKey.getPublicKey().getEncoded());
 
    }
 

src/test/java/net/markenwerk/utils/mail/dkim/Utils.java

@@ -8,9 +8,9 @@
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
 import java.util.Random;
 
-import net.iharder.Base64;
 import net.markenwerk.commons.nulls.NullOutputStream;
 import net.markenwerk.utils.data.fetcher.BufferedDataFetcher;
 
@@ -53,7 +53,7 @@ static String digest(String string, String algorithm) throws IOException, NoSuch
 		MessageDigest digest = MessageDigest.getInstance(algorithm);
 		DigestOutputStream out = new DigestOutputStream(new NullOutputStream(), digest);
 		new BufferedDataFetcher().copy(new ByteArrayInputStream(string.getBytes()), out, true, true);
-		return Base64.encodeBytes(digest.digest());
+		return Base64.getEncoder().encodeToString(digest.digest());
 	}
 
 	static DkimSigner getSigner(Canonicalization canonicalization, SigningAlgorithm algorithm) throws Exception {