Updated loadDecryptionKey and loadEncryptionCertificate to support InputStream

Author: e113028

src/main/java/com/mastercard/developer/utils/EncryptionUtils.java

@@ -2,6 +2,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -32,29 +33,31 @@ private EncryptionUtils() {
      * Populate a X509 encryption certificate object with the certificate data at the given file path.
      */
     public static Certificate loadEncryptionCertificate(String certificatePath) throws CertificateException, IOException {
-        return loadEncryptionCertificate(Files.readAllBytes(Paths.get(certificatePath)));
+        return loadEncryptionCertificate(Files.newInputStream(Paths.get(certificatePath)));
     }
 
     /**
      * Populate a X509 encryption certificate object with the certificate data at the given certificate data in bytes.
      */
-    public static Certificate loadEncryptionCertificate(byte[] certificateBytes) throws CertificateException {
+    public static Certificate loadEncryptionCertificate(InputStream certificateStream) throws CertificateException {
         CertificateFactory factory = CertificateFactory.getInstance("X.509");
-        return factory.generateCertificate(new ByteArrayInputStream(certificateBytes));
+        return factory.generateCertificate(certificateStream);
     }
 
     /**
      * Load a RSA decryption key from a file (PEM or DER).
      */
     public static PrivateKey loadDecryptionKey(String keyFilePath) throws GeneralSecurityException, IOException {
-        return loadDecryptionKey(Files.readAllBytes(Paths.get(keyFilePath)));
+        InputStream keyStream = new ByteArrayInputStream(Files.readAllBytes(Paths.get(keyFilePath)));
+        return loadDecryptionKey(keyStream);
     }
 
     /**
      * Load a RSA decryption key from key data in bytes.
      */
-    public static PrivateKey loadDecryptionKey(byte[] keyDataBytes) throws GeneralSecurityException {
-        String keyDataString = new String(keyDataBytes, StandardCharsets.UTF_8);
+    public static PrivateKey loadDecryptionKey(InputStream keyDataStream) throws GeneralSecurityException, IOException {
+        byte[] keyBytes = keyDataStream.readAllBytes();
+        String keyDataString = new String(keyBytes, StandardCharsets.UTF_8);
 
         if (keyDataString.contains(PKCS_1_PEM_HEADER)) {
             // OpenSSL / PKCS#1 Base64 PEM encoded file
@@ -75,7 +78,7 @@ public static PrivateKey loadDecryptionKey(byte[] keyDataBytes) throws GeneralSe
         }
 
         // We assume it's a PKCS#8 DER encoded binary file
-        return readPkcs8PrivateKey(keyDataBytes);
+        return readPkcs8PrivateKey(keyBytes);
     }
 
     /**

src/test/java/com/mastercard/developer/utils/EncryptionUtilsTest.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.rules.ExpectedException;
 
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Paths;
@@ -79,10 +80,10 @@ void testLoadDecryptionKey_ShouldSupportPkcs8Der(String keyLocation, String expe
     void testLoadDecryptionKey_ShouldSupportPkcs8DerBytes(String keyLocation, String expectedEncoding) throws Exception {
 
         // GIVEN
-        byte[] keyBytes = Files.readAllBytes(Paths.get(String.format("./src/test/resources/keys/%s", keyLocation)));
+        InputStream keyStream = Files.newInputStream(Paths.get(String.format("./src/test/resources/keys/%s", keyLocation)));
 
         // WHEN
-        PrivateKey privateKey = EncryptionUtils.loadDecryptionKey(keyBytes);
+        PrivateKey privateKey = EncryptionUtils.loadDecryptionKey(keyStream);
 
         // THEN
         assertNotNull(privateKey);
@@ -118,10 +119,10 @@ void testLoadDecryptionKey_ShouldSupportPkcs1Base64Pem_512bits(String fileName)
     void testLoadDecryptionKey_ShouldSupportPkcs1Base64PemBytes_512bits(String fileName) throws Exception {
 
         // GIVEN
-        byte[] keyBytes = Files.readAllBytes(Paths.get(String.format("./src/test/resources/keys/pkcs1/%s", fileName)));
+        InputStream keyStream = Files.newInputStream(Paths.get(String.format("./src/test/resources/keys/pkcs1/%s", fileName)));
 
         // WHEN
-        PrivateKey privateKey = EncryptionUtils.loadDecryptionKey(keyBytes);
+        PrivateKey privateKey = EncryptionUtils.loadDecryptionKey(keyStream);
 
         // THEN
         assertNotNull(privateKey);