You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by ru...@apache.org on 2006/02/10 15:12:38 UTC
svn commit: r376696 - in /webservices/wss4j/trunk:
src/org/apache/ws/security/message/WSSecDKEncrypt.java
src/org/apache/ws/security/message/WSSecDKSign.java
src/org/apache/ws/security/message/WSSecDKSignEncrypt.java
test/wssec/TestWSSecurityNewDK.java
Author: ruchithf
Date: Fri Feb 10 06:12:36 2006
New Revision: 376696
URL: http://svn.apache.org/viewcvs?rev=376696&view=rev
Log:
- Renamed WSSecDKSignEncrypt.java to WSSecDKEncrypt.java
- Added a missing licence header
Added:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
- copied, changed from r376649, webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSignEncrypt.java
Removed:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSignEncrypt.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
Copied: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java (from r376649, webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSignEncrypt.java)
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java?p2=webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java&p1=webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSignEncrypt.java&r1=376649&r2=376696&rev=376696&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSignEncrypt.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java Fri Feb 10 06:12:36 2006
@@ -43,11 +43,12 @@
*
* @author Ruchith Fernando (ruchith.fernando@gmail.com)
*/
-public class WSSecDKSignEncrypt extends WSSecDerivedKeyBase {
+public class WSSecDKEncrypt extends WSSecDerivedKeyBase {
protected String symEncAlgo = WSConstants.AES_128;
- public Document build(Document doc, Crypto crypto, WSSecHeader secHeader) throws WSSecurityException {
+ public Document build(Document doc, Crypto crypto, WSSecHeader secHeader)
+ throws WSSecurityException {
/*
* Setup the encrypted key
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java?rev=376696&r1=376695&r2=376696&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java Fri Feb 10 06:12:36 2006
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2003-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package org.apache.ws.security.message;
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java?rev=376696&r1=376695&r2=376696&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java Fri Feb 10 06:12:36 2006
@@ -44,8 +44,8 @@
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.message.WSSecDKEncrypt;
import org.apache.ws.security.message.WSSecDKSign;
-import org.apache.ws.security.message.WSSecDKSignEncrypt;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.xml.security.signature.XMLSignature;
import org.w3c.dom.Document;
@@ -126,7 +126,7 @@
*/
public void testEncryptionDecryptionTRIPLEDES() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- WSSecDKSignEncrypt builder = new WSSecDKSignEncrypt();
+ WSSecDKEncrypt builder = new WSSecDKEncrypt();
builder.setEncryptionUser("wss4jcert");
builder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
@@ -147,7 +147,7 @@
*/
public void testEncryptionDecryptionAES128() throws Exception {
SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
- WSSecDKSignEncrypt builder = new WSSecDKSignEncrypt();
+ WSSecDKEncrypt builder = new WSSecDKEncrypt();
builder.setEncryptionUser("wss4jcert");
builder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
builder.setSymmetricEncAlgorithm(WSConstants.AES_128);
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org