Update for newer BouncyCastle
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/f229d5ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/f229d5ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/f229d5ea Branch: refs/heads/master Commit: f229d5ea8b073b5ff89dd903d014fb54c7d3f153 Parents: fec4a26 Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Jun 27 14:16:22 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Jun 27 14:16:22 2016 +0100 ---------------------------------------------------------------------- taverna-credential-manager-ui/pom.xml | 6 ++++++ .../credentialmanager/CredentialManagerUI.java | 21 ++++++++++---------- .../WarnUserAboutJCEPolicyDialog.java | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/f229d5ea/taverna-credential-manager-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-credential-manager-ui/pom.xml b/taverna-credential-manager-ui/pom.xml index 318acb8..be4a3ad 100644 --- a/taverna-credential-manager-ui/pom.xml +++ b/taverna-credential-manager-ui/pom.xml @@ -70,5 +70,11 @@ <artifactId>bcprov-jdk15on</artifactId> <version>${bcprov.version}</version> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>${bcprov.version}</version> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/f229d5ea/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java ---------------------------------------------------------------------- diff --git a/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java index 7547918..cc0684c 100644 --- a/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java +++ b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java @@ -78,15 +78,14 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.TableColumn; +import org.apache.log4j.Logger; import org.apache.taverna.security.credentialmanager.CMException; import org.apache.taverna.security.credentialmanager.CredentialManager; import org.apache.taverna.security.credentialmanager.CredentialManager.KeystoreType; import org.apache.taverna.security.credentialmanager.DistinguishedNameParser; import org.apache.taverna.security.credentialmanager.UsernamePassword; - -import org.apache.log4j.Logger; -import org.bouncycastle.openssl.PEMReader; -import org.bouncycastle.openssl.PEMWriter; +import org.bouncycastle.openssl.PEMParser; +import org.bouncycastle.openssl.jcajce.JcaPEMWriter; /** * Provides a UI for the Credential Manager for users to manage their @@ -1139,7 +1138,7 @@ public class CredentialManagerUI extends JFrame { try { // Load the PKCS #12 keystore from the file // (this is using the BouncyCastle provider !!!) - KeyStore pkcs12Keystore = credManager.loadPKCS12Keystore(importFile, + KeyStore pkcs12Keystore = credManager.loadPKCS12Keystore(importFile.toPath(), pkcs12Password); /* @@ -1239,7 +1238,7 @@ public class CredentialManagerUI extends JFrame { // Export the key pair try { - credManager.exportKeyPair(alias, exportFile, pkcs12Password); + credManager.exportKeyPair(alias, exportFile.toPath(), pkcs12Password); showMessageDialog(this, "Key pair export successful", ALERT_TITLE, INFORMATION_MESSAGE); } catch (CMException cme) { @@ -1316,10 +1315,9 @@ public class CredentialManagerUI extends JFrame { if (trustCertsList.size() == 0) { // Could not load certificates as any of the above types - try (FileInputStream fis = new FileInputStream(certFile); - PEMReader pr = new PEMReader( - new InputStreamReader(fis), null, cf - .getProvider().getName())) { + + try (PEMParser pr = new PEMParser( + new InputStreamReader(new FileInputStream(certFile)))) { /* * Try as openssl PEM format - which sligtly differs from * the one supported by JCE @@ -1407,7 +1405,8 @@ public class CredentialManagerUI extends JFrame { return false; // Export the trusted certificate - try (PEMWriter pw = new PEMWriter(new FileWriter(exportFile))) { + try (JcaPEMWriter pw = new JcaPEMWriter(new FileWriter(exportFile))) { + //try (PEMWriter pw = new PEMWriter(new FileWriter(exportFile))) { // Get the trusted certificate pw.writeObject(credManager.getCertificate(TRUSTSTORE, alias)); } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/f229d5ea/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java ---------------------------------------------------------------------- diff --git a/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java index c88c090..86b202e 100644 --- a/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java +++ b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java @@ -197,7 +197,7 @@ public class WarnUserAboutJCEPolicyDialog extends NonBlockedHelpEnabledDialog { ApplicationConfiguration applicationConfiguration, DistinguishedNameParser dnParser) { return new File( - dnParser.getCredentialManagerDefaultDirectory(applicationConfiguration), + dnParser.getCredentialManagerDefaultDirectory(applicationConfiguration).toFile(), DO_NOT_WARN_ABOUT_JCE_POLICY); }
