You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/03/14 16:23:15 UTC
svn commit: r1081420 - in /webservices/wss4j/trunk/src:
main/java/org/apache/ws/security/components/crypto/Merlin.java
main/java/org/apache/ws/security/message/token/Timestamp.java
site/xdoc/config.xml
Author: coheigea
Date: Mon Mar 14 15:23:14 2011
New Revision: 1081420
URL: http://svn.apache.org/viewvc?rev=1081420&view=rev
Log:
Made some changes to keystore/cert provider properties.
Modified:
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/Timestamp.java
webservices/wss4j/trunk/src/site/xdoc/config.xml
Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java?rev=1081420&r1=1081419&r2=1081420&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java Mon Mar 14 15:23:14 2011
@@ -71,16 +71,14 @@ public class Merlin extends CryptoBase {
*/
public static final String OLD_KEYSTORE_FILE =
"org.apache.ws.security.crypto.merlin.file";
- public static final String OLD_CRYPTO_PROVIDER =
- "org.apache.ws.security.crypto.merlin.keystore.provider";
- public static final String OLD_CRYPTO_CERT_PROVIDER =
- "org.apache.ws.security.crypto.merlin.cert.provider";
/*
- * Crypto provider
+ * Crypto providers
*/
- public static final String CRYPTO_PROVIDER =
- "org.apache.ws.security.crypto.merlin.crypto.provider";
+ public static final String CRYPTO_KEYSTORE_PROVIDER =
+ "org.apache.ws.security.crypto.merlin.keystore.provider";
+ public static final String CRYPTO_CERT_PROVIDER =
+ "org.apache.ws.security.crypto.merlin.cert.provider";
/*
* KeyStore configuration types
@@ -139,13 +137,16 @@ public class Merlin extends CryptoBase {
return;
}
this.properties = properties;
- String provider = properties.getProperty(CRYPTO_PROVIDER);
- if (provider == null) {
- provider = properties.getProperty(OLD_CRYPTO_PROVIDER);
- }
+ //
+ // Load the provider(s)
+ //
+ String provider = properties.getProperty(CRYPTO_KEYSTORE_PROVIDER);
if (provider != null) {
provider = provider.trim();
- cryptoProvider = provider;
+ }
+ String certProvider = properties.getProperty(CRYPTO_CERT_PROVIDER);
+ if (certProvider != null) {
+ setCryptoProvider(certProvider);
}
//
// Load the KeyStore
Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/Timestamp.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/Timestamp.java?rev=1081420&r1=1081419&r2=1081420&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/Timestamp.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/Timestamp.java Mon Mar 14 15:23:14 2011
@@ -309,7 +309,6 @@ public class Timestamp {
* @param timeToLive the value in seconds for the validity of the Created time
* @param futureTimeToLive the value in seconds for the future validity of the Created time
* @return true if the timestamp is before (now-timeToLive), false otherwise
- * @param futureTimeToLive
*/
public boolean verifyCreated(
int timeToLive,
Modified: webservices/wss4j/trunk/src/site/xdoc/config.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/site/xdoc/config.xml?rev=1081420&r1=1081419&r2=1081420&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/site/xdoc/config.xml (original)
+++ webservices/wss4j/trunk/src/site/xdoc/config.xml Mon Mar 14 15:23:14 2011
@@ -34,6 +34,14 @@ General properties:
<td>WSS4J specific provider used to create Crypto instances. Defaults to:
"org.apache.ws.security.components.crypto.Merlin".</td>
</tr>
+<tr>
+<td>org.apache.ws.security.crypto.merlin.keystore.provider</td>
+<td>The provider used to load keystores. Defaults to installed provider.</td>
+</tr>
+<tr>
+<td>org.apache.ws.security.crypto.merlin.cert.provider</td>
+<td>The provider used to load certificates. Defaults to keystore provider.</td>
+</tr>
</table>
<p>
Keystore properties:
@@ -44,10 +52,6 @@ Keystore properties:
<th>Property value</th>
</tr>
<tr>
-<td>org.apache.ws.security.crypto.merlin.crypto.provider</td>
-<td>The provider used to load keystores. Defaults to installed provider.</td>
-</tr>
-<tr>
<td>org.apache.ws.security.crypto.merlin.keystore.file</td>
<td>The location of the keystore</td>
</tr>