You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2007/12/21 17:55:22 UTC
svn commit: r606245 - in
/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom:
DOMDSASignatureMethod.java DOMRSASignatureMethod.java
Author: mullan
Date: Fri Dec 21 08:55:21 2007
New Revision: 606245
URL: http://svn.apache.org/viewvc?rev=606245&view=rev
Log:
Fixed bug 43056: Library does not allow specify provider for private key operations
Modified:
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMDSASignatureMethod.java
xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRSASignatureMethod.java
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMDSASignatureMethod.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMDSASignatureMethod.java?rev=606245&r1=606244&r2=606245&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMDSASignatureMethod.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMDSASignatureMethod.java Fri Dec 21 08:55:21 2007
@@ -27,12 +27,13 @@
import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
+import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
+import java.security.Provider;
import java.security.PublicKey;
-import java.security.NoSuchAlgorithmException;
-import java.security.InvalidAlgorithmParameterException;
import java.security.Signature;
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
@@ -113,7 +114,10 @@
}
if (signature == null) {
try {
- signature = Signature.getInstance("SHA1withDSA");
+ Provider p = (Provider) context.getProperty
+ ("org.jcp.xml.dsig.internal.dom.SignatureProvider");
+ signature = (p == null) ? Signature.getInstance("SHA1withDSA")
+ : Signature.getInstance("SHA1withDSA", p);
} catch (NoSuchAlgorithmException nsae) {
throw new SignatureException("SHA1withDSA Signature not found");
}
@@ -147,7 +151,10 @@
}
if (signature == null) {
try {
- signature = Signature.getInstance("SHA1withDSA");
+ Provider p = (Provider) context.getProperty
+ ("org.jcp.xml.dsig.internal.dom.SignatureProvider");
+ signature = (p == null) ? Signature.getInstance("SHA1withDSA")
+ : Signature.getInstance("SHA1withDSA", p);
} catch (NoSuchAlgorithmException nsae) {
throw new InvalidKeyException("SHA1withDSA Signature not found");
}
Modified: xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRSASignatureMethod.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRSASignatureMethod.java?rev=606245&r1=606244&r2=606245&view=diff
==============================================================================
--- xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRSASignatureMethod.java (original)
+++ xml/security/trunk/src/org/jcp/xml/dsig/internal/dom/DOMRSASignatureMethod.java Fri Dec 21 08:55:21 2007
@@ -27,14 +27,15 @@
import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
+import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
+import java.security.Provider;
import java.security.PublicKey;
-import java.security.InvalidAlgorithmParameterException;
import java.security.Signature;
import java.security.SignatureException;
-import java.security.NoSuchAlgorithmException;
import java.security.spec.AlgorithmParameterSpec;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -115,7 +116,10 @@
if (signature == null) {
try {
// FIXME: do other hashes besides sha-1
- signature = Signature.getInstance("SHA1withRSA");
+ Provider p = (Provider) context.getProperty
+ ("org.jcp.xml.dsig.internal.dom.SignatureProvider");
+ signature = (p == null) ? Signature.getInstance("SHA1withRSA")
+ : Signature.getInstance("SHA1withRSA", p);
} catch (NoSuchAlgorithmException nsae) {
throw new SignatureException("SHA1withRSA Signature not found");
}
@@ -142,7 +146,10 @@
if (signature == null) {
try {
// FIXME: do other hashes besides sha-1
- signature = Signature.getInstance("SHA1withRSA");
+ Provider p = (Provider) context.getProperty
+ ("org.jcp.xml.dsig.internal.dom.SignatureProvider");
+ signature = (p == null) ? Signature.getInstance("SHA1withRSA")
+ : Signature.getInstance("SHA1withRSA", p);
} catch (NoSuchAlgorithmException nsae) {
throw new InvalidKeyException("SHA1withRSA Signature not found");
}