You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ru...@apache.org on 2006/11/20 07:14:57 UTC
svn commit: r477064 - in /webservices/wss4j/trunk/src/org/apache/ws/security:
WSSecurityEngineResult.java conversation/dkalgo/P_SHA1.java
conversation/errors.properties processor/EncryptedKeyProcessor.java
processor/ReferenceListProcessor.java
Author: ruchithf
Date: Sun Nov 19 22:14:56 2006
New Revision: 477064
URL: http://svn.apache.org/viewvc?view=rev&rev=477064
Log:
Enabled extracting the key in EncryptedKey for reuse
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngineResult.java
webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/P_SHA1.java
webservices/wss4j/trunk/src/org/apache/ws/security/conversation/errors.properties
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/WSSecurityEngineResult.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngineResult.java?view=diff&rev=477064&r1=477063&r2=477064
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngineResult.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngineResult.java Sun Nov 19 22:14:56 2006
@@ -41,6 +41,8 @@
private Set signedElements;
private byte[] signatureValue = null;
private SignatureConfirmation sigConf = null;
+ private byte[] decryptedKey = null;
+ private String encryptedKeyId = null;
public WSSecurityEngineResult(int act, SAMLAssertion ass) {
principal = null;
@@ -58,6 +60,12 @@
signatureValue = sv;
}
+ public WSSecurityEngineResult(int act, byte[] decryptedKey,
+ String encyptedKeyId) {
+ action = act;
+ this.decryptedKey = decryptedKey;
+ this.encryptedKeyId = encyptedKeyId;
+ }
public WSSecurityEngineResult(int act, Timestamp tstamp) {
action = act;
timestamp = tstamp;
@@ -140,6 +148,14 @@
public SecurityContextToken getSecurityContextToken() {
return securityContextToken;
+ }
+
+ public byte[] getDecryptedKey() {
+ return decryptedKey;
+ }
+
+ public String getEncryptedKeyId() {
+ return encryptedKeyId;
}
}
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/P_SHA1.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/P_SHA1.java?view=diff&rev=477064&r1=477063&r2=477064
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/P_SHA1.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/conversation/dkalgo/P_SHA1.java Sun Nov 19 22:14:56 2006
@@ -62,8 +62,7 @@
return key;
} catch (Exception ex) {
- throw new ConversationException("Key Derivation : P_SHA-1: "
- + ex.getMessage());
+ throw new ConversationException("errorInKeyDerivation", null, ex);
}
}
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/conversation/errors.properties
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/conversation/errors.properties?view=diff&rev=477064&r1=477063&r2=477064
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/conversation/errors.properties (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/conversation/errors.properties Sun Nov 19 22:14:56 2006
@@ -5,5 +5,5 @@
UnableToRenew = The specified context token could not be renewed.
-
+errorInKeyDerivation = Error in key derivation
unsupportedSecConvVersion = Unsupported WS-SecureConversation version
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java?view=diff&rev=477064&r1=477063&r2=477064
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java Sun Nov 19 22:14:56 2006
@@ -76,7 +76,9 @@
handleEncryptedKey((Element) elem, cb, decCrypto);
encryptedKeyId = elem.getAttributeNS(null, "Id");
- returnResults.add(0, new WSSecurityEngineResult(WSConstants.ENCR, null, null, null, null));
+ returnResults.add(0, new WSSecurityEngineResult(WSConstants.ENCR,
+ this.decryptedBytes,
+ this.encryptedKeyId));
}
public void handleEncryptedKey(Element xencEncryptedKey,
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java?view=diff&rev=477064&r1=477063&r2=477064
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/processor/ReferenceListProcessor.java Sun Nov 19 22:14:56 2006
@@ -65,7 +65,7 @@
wsDocInfo = wdi;
handleReferenceList((Element) elem, cb);
returnResults.add(0, new WSSecurityEngineResult(WSConstants.ENCR, null,
- null, null, null));
+ null));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org