Move data processing to update thread

[netconf.git] / keystore / keystore-legacy / src / main / java / org / opendaylight / netconf / keystore / legacy / SecurityHelper.java

diff --git a/keystore/keystore-legacy/src/main/java/org/opendaylight/netconf/keystore/legacy/SecurityHelper.java b/keystore/keystore-legacy/src/main/java/org/opendaylight/netconf/keystore/legacy/SecurityHelper.java
index 621240bbc24faa7f06477d482ae8589d699a8f42..18b3b547da51def17bf232ead9fadbea8e9b0eb7 100644 (file)
--- a/keystore/keystore-legacy/src/main/java/org/opendaylight/netconf/keystore/legacy/SecurityHelper.java
+++ b/keystore/keystore-legacy/src/main/java/org/opendaylight/netconf/keystore/legacy/SecurityHelper.java
@@ -8,7 +8,6 @@
 package org.opendaylight.netconf.keystore.legacy;
 
 import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
@@ -16,16 +15,15 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Base64;
 import org.eclipse.jdt.annotation.NonNull;
 
-public final class SecurityHelper {
+final class SecurityHelper {
     private CertificateFactory certFactory;
     private KeyFactory dsaFactory;
     private KeyFactory rsaFactory;
 
-    public @NonNull PrivateKey getJavaPrivateKey(final String base64PrivateKey) throws GeneralSecurityException {
-        final var keySpec = new PKCS8EncodedKeySpec(base64Decode(base64PrivateKey));
+    @NonNull PrivateKey generatePrivateKey(final byte[] privateKey) throws GeneralSecurityException {
+        final var keySpec = new PKCS8EncodedKeySpec(privateKey);
 
         if (rsaFactory == null) {
             rsaFactory = KeyFactory.getInstance("RSA");
@@ -42,18 +40,12 @@ public final class SecurityHelper {
         return dsaFactory.generatePrivate(keySpec);
     }
 
-    public @NonNull X509Certificate getCertificate(final String base64Certificate) throws GeneralSecurityException {
+    @NonNull X509Certificate generateCertificate(final byte[] certificate) throws GeneralSecurityException {
         // TODO: https://stackoverflow.com/questions/43809909/is-certificatefactory-getinstancex-509-thread-safe
         //        indicates this is thread-safe in most cases, but can we get a better assurance?
         if (certFactory == null) {
             certFactory = CertificateFactory.getInstance("X.509");
         }
-        return (X509Certificate) certFactory.generateCertificate(
-            new ByteArrayInputStream(base64Decode(base64Certificate)));
+        return (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(certificate));
     }
-
-    private static byte[] base64Decode(final String base64) {
-        return Base64.getMimeDecoder().decode(base64.getBytes(StandardCharsets.US_ASCII));
-    }
-
 }
\ No newline at end of file