Author: coheigea
Date: Sat Sep 11 17:25:49 2010
New Revision: 996180
URL: http://svn.apache.org/viewvc?rev=996180&view=rev
Log:
[WSS-246] - Upgrade to BouncyCastle 1.45
- Plus some fixes to make sure it compiles with JDK 1.4
Added:
webservices/wss4j/branches/1_5_x-fixes/lib/bcprov-jdk14-1.45.jar (with
props)
Removed:
webservices/wss4j/branches/1_5_x-fixes/lib/bcprov-jdk14-1.43.jar
Modified:
webservices/wss4j/branches/1_5_x-fixes/README.txt
webservices/wss4j/branches/1_5_x-fixes/pom.xml
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/handler/WSHandler.java
Modified: webservices/wss4j/branches/1_5_x-fixes/README.txt
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/README.txt?rev=996180&r1=996179&r2=996180&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/README.txt (original)
+++ webservices/wss4j/branches/1_5_x-fixes/README.txt Sat Sep 11 17:25:49 2010
@@ -149,7 +149,7 @@ axis-saaj-1.4.jar
See: http://ws.apache.org/axis/
-bcprov-jdk14-1.43.jar
+bcprov-jdk14-1.45.jar
This is the BouncyCastle library that implements all necessary
encryption, hashing, certificate, and keystore functions. Without
this fantastic library WSS4J wouldn't work at all.
Added: webservices/wss4j/branches/1_5_x-fixes/lib/bcprov-jdk14-1.45.jar
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/lib/bcprov-jdk14-1.45.jar?rev=996180&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/wss4j/branches/1_5_x-fixes/lib/bcprov-jdk14-1.45.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/wss4j/branches/1_5_x-fixes/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/pom.xml?rev=996180&r1=996179&r2=996180&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/pom.xml (original)
+++ webservices/wss4j/branches/1_5_x-fixes/pom.xml Sat Sep 11 17:25:49 2010
@@ -399,8 +399,8 @@
<xmlsec.version>1.4.3</xmlsec.version>
<opensaml.version>1.1</opensaml.version>
<xml.apis.version>1.3.03</xml.apis.version>
- <bcprov.jdk14.version>1.43</bcprov.jdk14.version>
- <bcprov.jdk15.version>1.43</bcprov.jdk15.version>
+ <bcprov.jdk14.version>1.45</bcprov.jdk14.version>
+ <bcprov.jdk15.version>1.45</bcprov.jdk15.version>
<commons.logging.version>1.1</commons.logging.version>
<xalan.version>2.7.1</xalan.version>
<xerces.version>2.8.1</xerces.version>
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/handler/WSHandler.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/handler/WSHandler.java?rev=996180&r1=996179&r2=996180&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/handler/WSHandler.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/handler/WSHandler.java
Sat Sep 11 17:25:49 2010
@@ -531,13 +531,13 @@ public abstract class WSHandler {
}
String derived = getString(WSHandlerConstants.USE_DERIVED_KEY, mc);
- boolean useDerivedKey = Boolean.parseBoolean(derived);
+ boolean useDerivedKey = Boolean.valueOf(derived).booleanValue();
if (useDerivedKey) {
reqData.setUseDerivedKey(useDerivedKey);
}
String derivedMAC = getString(WSHandlerConstants.USE_DERIVED_KEY, mc);
- boolean useDerivedKeyForMAC = Boolean.parseBoolean(derivedMAC);
+ boolean useDerivedKeyForMAC =
Boolean.valueOf(derivedMAC).booleanValue();
if (useDerivedKeyForMAC) {
reqData.setUseDerivedKeyForMAC(useDerivedKeyForMAC);
}
@@ -654,7 +654,7 @@ public abstract class WSHandler {
String encSymEncKey = getString(WSHandlerConstants.ENC_SYM_ENC_KEY,
mc);
if (encSymEncKey != null) {
- boolean encSymEndKeyBoolean = Boolean.parseBoolean(encSymEncKey);
+ boolean encSymEndKeyBoolean =
Boolean.valueOf(encSymEncKey).booleanValue();
reqData.setEncryptSymmetricEncryptionKey(encSymEndKeyBoolean);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscr...@ws.apache.org
For additional commands, e-mail: wss4j-dev-h...@ws.apache.org
