Author: kstam
Date: Wed Jan 29 20:43:11 2014
New Revision: 1562587
URL: http://svn.apache.org/r1562587
Log:
https://issues.apache.org/jira/browse/JUDDI-807 adding fixes for OSX
Modified:
juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java
Modified:
juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java?rev=1562587&r1=1562586&r2=1562587&view=diff
==============================================================================
---
juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java
(original)
+++
juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java
Wed Jan 29 20:43:11 2014
@@ -90,17 +90,20 @@ public class XmlSigApplet2 extends java.
this.jList1.removeAll();
Vector<String> certs = new Vector<String>();
+ String keyStoreError = "";
//covers all modern browsers in windows
- try {
- keyStore = KeyStore.getInstance("Windows-MY");
- keyStore.load(null, null);
- } catch (Exception ex) {
- System.out.println("Error loading Windows cert store " +
ex.getMessage());
- //ex.printStackTrace();
- //JOptionPane.showMessageDialog(this, ex.getMessage());
+ if (System.getProperty("os.name").startsWith("Windows")) {
+ try {
+ keyStore = KeyStore.getInstance("Windows-MY");
+ keyStore.load(null, null);
+ } catch (Exception ex) {
+ keyStoreError += "Error loading Windows cert store " +
ex.getMessage() + "\n";
+ //ex.printStackTrace();
+ //JOptionPane.showMessageDialog(this, ex.getMessage());
+ }
}
//firefox keystore
- if (keyStore != null) {
+ if (keyStore == null) {
try {
@@ -112,12 +115,12 @@ public class XmlSigApplet2 extends java.
keyStore.load(null, "password".toCharArray());
} catch (Exception ex) {
//JOptionPane.showMessageDialog(this, ex.getMessage());
- System.out.println("Error loading Firefox cert store " +
ex.getMessage());
+ keyStoreError += "Error loading Firefox cert store " +
ex.getMessage() + "\n";
//ex.printStackTrace();
}
}
//MacOS with Safari possibly others
- if (keyStore != null) {
+ if (keyStore == null) {
try {
keyStore = KeyStore.getInstance("KeychainStore");
keyStore.load(null, null);
@@ -125,10 +128,13 @@ public class XmlSigApplet2 extends java.
} catch (Exception ex) {
//JOptionPane.showMessageDialog(this, ex.getMessage());
//ex.printStackTrace();
- System.out.println("Error loading MACOS Key chain cert store "
+ ex.getMessage());
+ keyStoreError += "Error loading MACOS Key chain cert store " +
ex.getMessage()+ "\n";
}
}
- if (keyStore!=null){
+
+ if (keyStore == null) {
+ System.err.println(keyStoreError);
+ } else {
try {
Enumeration<String> aliases = keyStore.aliases();
@@ -138,7 +144,7 @@ public class XmlSigApplet2 extends java.
//this is needed to test for access
try {
- Key key = keyStore.getKey(a, null);
+ Key key = keyStore.getKey(a, "MyPasswd".toCharArray());
certs.add(a);
} catch (Exception x) {
@@ -443,7 +449,7 @@ public class XmlSigApplet2 extends java.
ds.put(DigSigUtil.SIGNATURE_OPTION_DIGEST_METHOD,
jTextFieldDigestMethod.getText());
ds.put(DigSigUtil.CANONICALIZATIONMETHOD,
jTextFieldc14n.getText());
- PrivateKey key = (PrivateKey) keyStore.getKey((String)
jList1.getSelectedValue(), null);
+ PrivateKey key = (PrivateKey) keyStore.getKey((String)
jList1.getSelectedValue(), "MyPasswd".toCharArray());
Certificate publickey = keyStore.getCertificate((String)
jList1.getSelectedValue());
j = ds.signUddiEntity(j, publickey, key);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
