Author: ruchithf
Date: Wed Nov 21 01:31:17 2007
New Revision: 597005
URL: http://svn.apache.org/viewvc?rev=597005&view=rev
Log:
Applied Nandana's patches in RAMPART-110 and RAMPART-111
Thanks Nandana.
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/Constants.java
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=597005&r1=597004&r2=597005&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
Wed Nov 21 01:31:17 2007
@@ -172,21 +172,7 @@
encr.setDocument(doc);
RampartUtil.setEncryptionUser(rmd, encr);
encr.setSymmetricEncAlgorithm(rpd.getAlgorithmSuite().getEncryption());
-
if(encryptionToken.getInclusion().equals(Constants.INCLUDE_NEVER)) {
- Wss10 wss = rpd.getWss11();
- if(wss == null) {
- wss = rpd.getWss10();
- }
- if(wss.isMustSupportRefKeyIdentifier()) {
-
encr.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
- } else if(wss.isMustSupportRefIssuerSerial()) {
-
encr.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- } else if(wss instanceof Wss11 &&
((Wss11)wss).isMustSupportRefThumbprint()) {
-
encr.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
- }
- } else {
-
encr.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
- }
+ RampartUtil.setKeyIdentifierType(rpd,encr,
encryptionToken);
encr.setKeyEncAlgo(rpd.getAlgorithmSuite().getAsymmetricKeyWrap());
encr.prepare(doc, RampartUtil.getEncryptionCrypto(config,
rmd.getCustomClassLoader()));
@@ -464,22 +450,7 @@
WSSecEncrypt encr = new WSSecEncrypt();
-
-
if(encrToken.getInclusion().equals(Constants.INCLUDE_NEVER)) {
- Wss10 wss = rpd.getWss11();
- if(wss == null) {
- wss = rpd.getWss10();
- }
- if(wss.isMustSupportRefKeyIdentifier()) {
-
encr.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
- } else if(wss.isMustSupportRefIssuerSerial()) {
-
encr.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- } else if(wss instanceof Wss11 &&
((Wss11)wss).isMustSupportRefThumbprint()) {
-
encr.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
- }
- } else {
-
encr.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
- }
+ RampartUtil.setKeyIdentifierType(rpd, encr, encrToken);
encr.setWsConfig(rmd.getConfig());
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=597005&r1=597004&r2=597005&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Wed Nov 21 01:31:17 2007
@@ -195,7 +195,7 @@
WSSecEncryptedKey encrKey = new WSSecEncryptedKey();
try {
- RampartUtil.setKeyIdentifierType(rpd, encrKey, token);
+ RampartUtil.setKeyIdentifierType(rpd, encrKey, token);
RampartUtil.setEncryptionUser(rmd, encrKey);
encrKey.setKeySize(rpd.getAlgorithmSuite().getMaximumSymmetricKeyLength());
encrKey.setKeyEncAlgo(rpd.getAlgorithmSuite().getAsymmetricKeyWrap());
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java?rev=597005&r1=597004&r2=597005&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
Wed Nov 21 01:31:17 2007
@@ -280,12 +280,14 @@
} else {
addSignatureConfirmation(rmd, sigParts);
}
-
+
+
//Sign the message
//We should use the same key in the case of EncryptBeforeSig
- signatureValues.add(this.doSymmSignature(rmd, encryptionToken,
tok, sigParts));
-
- this.mainSigId =
RampartUtil.addWsuIdToElement((OMElement)this.getInsertionLocation());
+ if ( sigParts.size() > 0) {
+ signatureValues.add(this.doSymmSignature(rmd, encryptionToken,
tok, sigParts));
+ this.mainSigId =
RampartUtil.addWsuIdToElement((OMElement)this.getInsertionLocation());
+ }
if(rmd.isInitiator()) {
//Do endorsed signatures
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/Constants.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/Constants.java?rev=597005&r1=597004&r2=597005&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/Constants.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/Constants.java
Wed Nov 21 01:31:17 2007
@@ -319,7 +319,7 @@
Constants.SP_PREFIX);
public static final QName REQUIRE_ISSUER_SERIAL_REFERENCE = new QName(
- Constants.SP_NS, "RequireIssuerSerializerReference",
+ Constants.SP_NS, "RequireIssuerSerialReference",
Constants.SP_PREFIX);
public static final QName REQUIRE_EMBEDDED_TOKEN_REFERENCE = new QName(
