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 mu...@apache.org on 2004/10/16 10:02:50 UTC
cvs commit: ws-fx/wss4j/src/org/apache/ws/security/conversation KeyDerivator.java ConversationEngine.java ConversationManager.java
muthulee 2004/10/16 01:02:50
Modified: wss4j/src/org/apache/ws/security/conversation
KeyDerivator.java ConversationEngine.java
ConversationManager.java
Log:
Updating components for interop scenario impl
Revision Changes Path
1.6 +1 -1 ws-fx/wss4j/src/org/apache/ws/security/conversation/KeyDerivator.java
Index: KeyDerivator.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/KeyDerivator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- KeyDerivator.java 16 Oct 2004 06:06:53 -0000 1.5
+++ KeyDerivator.java 16 Oct 2004 08:02:49 -0000 1.6
@@ -199,7 +199,7 @@
"Offset : " + offset);
} else if (convSession.getKeyLength() != -1) { //Session is configured to use fixed size keys
if (generation == -1){
- log.debug("Generation set to zero");
+ System.out.println("Generation set to zero");
generation = 0;
return (int)convSession.getKeyLength() * generation;
// throw new ConversationException("Generation value is not avaliable (fixed size keys are used: " +
1.6 +7 -5 ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationEngine.java
Index: ConversationEngine.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationEngine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConversationEngine.java 16 Oct 2004 06:06:53 -0000 1.5
+++ ConversationEngine.java 16 Oct 2004 08:02:50 -0000 1.6
@@ -1011,11 +1011,13 @@
}
- /**
- * Taken from WSSecurity Engine
- * @param encBodyData
- * @return
- */
+ /**
+ *
+ * Taken from WSSecurityEngine
+ *
+ * @param encBodyData
+ * @return
+ */
private boolean isContent(Node encBodyData) {
/*
* Depending on the encrypted data type (Content or Element) the encBodyData either
1.8 +1 -1 ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationManager.java
Index: ConversationManager.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConversationManager.java 16 Oct 2004 06:06:53 -0000 1.7
+++ ConversationManager.java 16 Oct 2004 08:02:50 -0000 1.8
@@ -199,7 +199,7 @@
* step 4 : Setting encryption parts
*/
wsEncrypt.setParts(parts);
-
+ System.out.println("Fix me");
wsEncrypt.setSymmetricEncAlgorithm(symAlgo);
try {