Author: ruchithf
Date: Wed Nov 7 16:43:35 2007
New Revision: 592982
URL: http://svn.apache.org/viewvc?rev=592982&view=rev
Log:
We should be able to set a custom reference type in the STR of a derived key
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java?rev=592982&r1=592981&r2=592982&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java
Wed Nov 7 16:43:35 2007
@@ -102,6 +102,8 @@
protected int derivedKeyLength = -1;
+ private String customValueType;
+
/**
* @param ephemeralKey The ephemeralKey to set.
*/
@@ -202,9 +204,10 @@
dkt = new DerivedKeyToken(this.wscVersion, document);
dktId = "derivedKeyId-" + dkt.hashCode();
+ dkt.setOffset(offset);
dkt.setLength(length);
dkt.setNonce(Base64.encode(nonce));
- dkt.setOffset(offset);
+
dkt.setID(dktId);
if(this.strElem == null) {
@@ -212,6 +215,9 @@
SecurityTokenReference strEncKey = new
SecurityTokenReference(document);
Reference ref = new Reference(document);
ref.setURI("#" + this.tokenIdentifier);
+ if(this.customValueType != null &&
this.customValueType.trim().length() > 0) {
+ ref.setValueType(this.customValueType);
+ }
strEncKey.setReference(ref);
dkt.setSecuityTokenReference(strEncKey);
} else {
@@ -255,5 +261,9 @@
public void setDerivedKeyLength(int keyLength) {
this.derivedKeyLength = keyLength;
+ }
+
+ public void setCustomValueType(String customValueType) {
+ this.customValueType = customValueType;
}
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java?rev=592982&r1=592981&r2=592982&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/DerivedKeyToken.java
Wed Nov 7 16:43:35 2007
@@ -279,7 +279,7 @@
*
* @param offset The offset value as an integer
*/
- public void setOffset( int offset) throws ConversationException {
+ public void setOffset(int offset) throws ConversationException {
//This element MUST NOT be used if the <Generation> element is
specified
if (this.elementGeneration == null) {
this.elementOffset =
this.element.getOwnerDocument().createElementNS(this.ns,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
