[refactor] do not maintain BC 1.47 compatibility

Author: kares

src/main/java/org/jruby/ext/openssl/PEMUtils.java

@@ -48,17 +48,17 @@
 import org.bouncycastle.crypto.PBEParametersGenerator;
 import org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator;
 import org.bouncycastle.crypto.params.KeyParameter;
-//import org.bouncycastle.openssl.MiscPEMGenerator;
+import org.bouncycastle.openssl.EncryptionException;
+import org.bouncycastle.openssl.PEMDecryptor;
+import org.bouncycastle.openssl.PEMDecryptorProvider;
+import org.bouncycastle.openssl.PEMEncryptedKeyPair;
+import org.bouncycastle.openssl.PEMException;
+import org.bouncycastle.openssl.PEMKeyPair;
+import org.bouncycastle.openssl.PEMParser;
 import org.bouncycastle.openssl.PEMWriter;
 import org.bouncycastle.operator.OperatorCreationException;
 
-import org.jruby.ext.openssl.impl.pem.MiscPEMGenerator;
-import org.jruby.ext.openssl.impl.pem.PEMDecryptor;
-import org.jruby.ext.openssl.impl.pem.PEMDecryptorProvider;
-import org.jruby.ext.openssl.impl.pem.PEMEncryptedKeyPair;
-import org.jruby.ext.openssl.impl.pem.PEMException;
-import org.jruby.ext.openssl.impl.pem.PEMKeyPair;
-import org.jruby.ext.openssl.impl.pem.PEMParser;
+import org.jruby.ext.openssl.impl.pem.MiscPEMGeneratorHelper;
 import org.jruby.ext.openssl.util.ByteArrayOutputStream;
 //import org.bouncycastle.util.io.pem.PemReader;
 
@@ -145,7 +145,7 @@ public static KeyPair readKeyPair(final Reader reader, final char[] password) th
 
     static PEMKeyPair readInternal(final Reader reader, final char[] password) throws IOException {
         Object keyPair = new PEMParser(reader).readObject();
-        if ( keyPair instanceof PEMEncryptedKeyPair ) {
+        if ( keyPair instanceof PEMEncryptedKeyPair) {
             return ((PEMEncryptedKeyPair) keyPair).decryptKeyPair(new PEMDecryptorImpl(password));
         }
         return (PEMKeyPair) keyPair;
@@ -171,7 +171,7 @@ public static void writePEM(final Writer writer, final Object obj,
 
         final SecureRandom random = SecurityHelper.getSecureRandom();
 
-        pemWriter.writeObject(MiscPEMGenerator.newInstance(obj, algorithm, password, random));
+        pemWriter.writeObject(MiscPEMGeneratorHelper.newGenerator(obj, algorithm, password, random));
         pemWriter.flush();
     }