Author: werner
Date: Thu Mar 16 01:23:53 2006
New Revision: 386294
URL: http://svn.apache.org/viewcvs?rev=386294&view=rev
Log:
Cleanup the explicit provider settings. We insert our preferred
JCEprovider at poisition 2, that is on the highest possible position.
Position 1 is reserved for internal JCE jar validation and does not
provide any other algorithms.
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java?rev=386294&r1=386293&r2=386294&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSSConfig.java Thu Mar
16 01:23:53 2006
@@ -77,14 +77,10 @@
* The last provider added has precedence, that is if JuiCE can be add
* then WSS4J uses this provider.
*/
- if (addJceProvider("BC",
- "org.bouncycastle.jce.provider.BouncyCastleProvider")) {
- setJceProviderId("BC");
- }
- if (addJceProvider("JuiCE",
- "org.apache.security.juice.provider.JuiCEProviderOpenSSL")) {
- setJceProviderId("JuiCE");
- }
+ addJceProvider("BC",
+ "org.bouncycastle.jce.provider.BouncyCastleProvider");
+ addJceProvider("JuiCE",
+ "org.apache.security.juice.provider.JuiCEProviderOpenSSL");
Transform.init();
try {
Transform.register(STRTransform.implementedTransformURI,
@@ -273,8 +269,12 @@
log.debug("The provider " + id
+ " had to be added to the
java.security.Security");
}
- java.security.Security.insertProviderAt(
+ int ret =java.security.Security.insertProviderAt(
(java.security.Provider) c.newInstance(), 2);
+ if (log.isDebugEnabled()) {
+ log.debug("The provider " + id + " was added at: "
+ + ret);
+ }
}
return true;
} catch (Throwable t) {
@@ -311,29 +311,7 @@
return false;
}
- /**
- * Sets the JCE provider to use in all following security operations.
- *
- * The method checks if the provider is known. If yes it sets the provider
- * id and returns true. Otherwise the provider id remains unchanged and the
- * method returns false.
- *
- * @param id
- * is the JCE provider's id
- * @return Returns <code>true</code> if set, <code>false</code>
- * otherwise
- * @see #addJceProvider
- */
- public boolean setJceProviderId(String id) {
- if (jceProvider.get(id) != null) {
- jceProviderId = id;
-// JCEMapper.setProviderId(id);
- return true;
- }
- return false;
- }
-
- public String getJceProviderId() {
- return jceProviderId;
- }
+// public String getJceProviderId() {
+// return jceProviderId;
+// }
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java?rev=386294&r1=386293&r2=386294&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSEncryptBody.java
Thu Mar 16 01:23:53 2006
@@ -493,13 +493,7 @@
XMLCipher xmlCipher = null;
try {
- String provider = wssConfig.getJceProviderId();
- if (provider == null) {
- xmlCipher = XMLCipher.getInstance(symEncAlgo);
- }
- else {
- xmlCipher = XMLCipher.getProviderInstance(symEncAlgo,
provider);
- }
+ xmlCipher = XMLCipher.getInstance(symEncAlgo);
} catch (XMLEncryptionException e3) {
throw new
WSSecurityException(WSSecurityException.UNSUPPORTED_ALGORITHM, null, null, e3);
}
@@ -637,22 +631,13 @@
private KeyGenerator getKeyGenerator() throws WSSecurityException {
KeyGenerator keyGen = null;
- String id = wssConfig.getJceProviderId();
try {
/*
* Assume AES as default, so initialize it
*/
- if (id == null) {
- keyGen = KeyGenerator.getInstance("AES");
- } else {
- keyGen = KeyGenerator.getInstance("AES", id);
- }
+ keyGen = KeyGenerator.getInstance("AES");
if
(symEncAlgo.equalsIgnoreCase(WSConstants.TRIPLE_DES)) {
- if (id == null) {
- keyGen =
KeyGenerator.getInstance("DESede");
- } else {
- keyGen =
KeyGenerator.getInstance("DESede", id);
- }
+ keyGen = KeyGenerator.getInstance("DESede");
} else if
(symEncAlgo.equalsIgnoreCase(WSConstants.AES_128)) {
keyGen.init(128);
} else if
(symEncAlgo.equalsIgnoreCase(WSConstants.AES_192)) {
@@ -663,9 +648,6 @@
return null;
}
} catch (NoSuchAlgorithmException e) {
- throw new WSSecurityException(
-
WSSecurityException.UNSUPPORTED_ALGORITHM, null, null, e);
- } catch (NoSuchProviderException e) {
throw new WSSecurityException(
WSSecurityException.UNSUPPORTED_ALGORITHM, null, null, e);
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java?rev=386294&r1=386293&r2=386294&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
Thu Mar 16 01:23:53 2006
@@ -564,7 +564,6 @@
private KeyGenerator getKeyGenerator() throws WSSecurityException {
KeyGenerator keyGen = null;
- String id = wssConfig.getJceProviderId();
try {
/*
* Assume AES as default, so initialize it
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java?rev=386294&r1=386293&r2=386294&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java
Thu Mar 16 01:23:53 2006
@@ -113,6 +113,14 @@
if(processor instanceof EncryptedKeyProcessor) {
this.secret =
((EncryptedKeyProcessor)processor).getDecryptedBytes();
}
+ else {
+ throw new WSSecurityException(
+ WSSecurityException.FAILED_ENC_DEC,
"unsupportedKeyId");
+ }
+ }
+ else {
+ throw new WSSecurityException(WSSecurityException.FAILED_ENC_DEC,
+ "noReference");
}
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java?rev=386294&r1=386293&r2=386294&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
Thu Mar 16 01:23:53 2006
@@ -388,12 +388,7 @@
// initialize Cipher ....
XMLCipher xmlCipher = null;
try {
- String provider = wssConfig.getJceProviderId();
- if (provider == null) {
- xmlCipher = XMLCipher.getInstance(symEncAlgo);
- } else {
- xmlCipher =
XMLCipher.getProviderInstance(symEncAlgo, provider);
- }
+ xmlCipher = XMLCipher.getInstance(symEncAlgo);
xmlCipher.init(XMLCipher.DECRYPT_MODE, symmetricKey);
} catch (XMLEncryptionException e) {
throw new WSSecurityException(
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java?rev=386294&r1=386293&r2=386294&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
Thu Mar 16 01:23:53 2006
@@ -146,12 +146,7 @@
// initialize Cipher ....
XMLCipher xmlCipher = null;
try {
- String provider = wssConfig.getJceProviderId();
- if (provider == null) {
- xmlCipher = XMLCipher.getInstance(symEncAlgo);
- } else {
- xmlCipher =
XMLCipher.getProviderInstance(symEncAlgo, provider);
- }
+ xmlCipher = XMLCipher.getInstance(symEncAlgo);
xmlCipher.init(XMLCipher.DECRYPT_MODE, symmetricKey);
} catch (XMLEncryptionException e1) {
throw new WSSecurityException(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
