Remove failed bouncycastle fix

Author: labkey-tchad

src/org/labkey/test/TestFileUtils.java

@@ -37,6 +37,7 @@
 import org.bouncycastle.openpgp.PGPPBEEncryptedData;
 import org.bouncycastle.openpgp.PGPUtil;
 import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
 import org.bouncycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder;
 import org.bouncycastle.util.io.Streams;
 import org.jetbrains.annotations.NotNull;
@@ -47,13 +48,15 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -469,7 +472,12 @@ public static File writeTempFile(String name, String contents) throws IOExceptio
      */
     public static File writeFile(File file, String contents) throws IOException
     {
-        try (Writer writer = PrintWriters.getPrintWriter(file))
+        return writeFile(file, contents, false);
+    }
+
+    public static File writeFile(File file, String contents, boolean append) throws IOException
+    {
+        try (Writer writer = new OutputStreamWriter(new FileOutputStream(file, append), StandardCharsets.UTF_8))
         {
             writer.write(contents);
             return file;
@@ -577,10 +585,10 @@ private static List<File> unTar(final File inputFile, final File outputDir) thro
     {
         final List<File> untaredFiles = new ArrayList<>();
         try (InputStream is = new FileInputStream(inputFile);
-             TarArchiveInputStream inputStream = (TarArchiveInputStream) new ArchiveStreamFactory().createArchiveInputStream("tar", is))
+             TarArchiveInputStream inputStream = new ArchiveStreamFactory().createArchiveInputStream("tar", is))
         {
             TarArchiveEntry entry;
-            while ((entry = (TarArchiveEntry) inputStream.getNextEntry()) != null)
+            while ((entry = inputStream.getNextEntry()) != null)
             {
                 final File outputFile = new File(outputDir, entry.getName());
                 if (entry.isDirectory())
@@ -597,7 +605,7 @@ private static List<File> unTar(final File inputFile, final File outputDir) thro
                 {
                     try (OutputStream outputFileStream = new FileOutputStream(outputFile))
                     {
-                        org.apache.commons.compress.utils.IOUtils.copy(inputStream, outputFileStream);
+                        IOUtils.copy(inputStream, outputFileStream);
                     }
                 }
                 untaredFiles.add(outputFile);
@@ -652,7 +660,7 @@ public static byte[] decrypt(byte[] encrypted, char[] passPhrase) throws IOExcep
         }
 
         PGPPBEEncryptedData pbe = (PGPPBEEncryptedData) enc.get(0);
-        InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder()
+        InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME).build())
                 .setProvider(BouncyCastleProvider.PROVIDER_NAME).build(passPhrase));
 
         JcaPGPObjectFactory pgpFact = new JcaPGPObjectFactory(clear);