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/07/05 19:14:20 UTC
svn commit: r419284 - in /webservices/wss4j/trunk:
src/org/apache/ws/security/message/ test/wssec/
Author: ruchithf
Date: Wed Jul 5 10:14:19 2006
New Revision: 419284
URL: http://svn.apache.org/viewvc?rev=419284&view=rev
Log:
Cleaning up a few method signatures - removing unwanted parameters
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDerivedKeyBase.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java?rev=419284&r1=419283&r2=419284&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java Wed Jul 5 10:14:19 2006
@@ -47,13 +47,13 @@
protected String symEncAlgo = WSConstants.AES_128;
- public Document build(Document doc, Crypto crypto, WSSecHeader secHeader)
+ public Document build(Document doc, WSSecHeader secHeader)
throws WSSecurityException {
/*
* Setup the encrypted key
*/
- prepare(doc, crypto);
+ prepare(doc);
this.envelope = doc.getDocumentElement();
/*
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKSign.java?rev=419284&r1=419283&r2=419284&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 Wed Jul 5 10:14:19 2006
@@ -80,11 +80,9 @@
private WSDocInfo wsDocInfo;
- public Document build(Document doc, Crypto crypto, WSSecHeader secHeader) throws WSSecurityException {
+ public Document build(Document doc, WSSecHeader secHeader) throws WSSecurityException {
- this.prepare(doc, crypto, secHeader);
-
-
+ this.prepare(doc, secHeader);
SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc
.getDocumentElement());
@@ -110,12 +108,11 @@
return doc;
}
- protected void prepare(Document doc, Crypto crypto, WSSecHeader secHeader)
+ protected void prepare(Document doc, WSSecHeader secHeader)
throws WSSecurityException {
- super.prepare(doc, crypto);
+ super.prepare(doc);
wsDocInfo = new WSDocInfo(doc.hashCode());
- wsDocInfo.setCrypto(crypto);
/*
* Get an initialize a XMLSignature element.
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=419284&r1=419283&r2=419284&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 Jul 5 10:14:19 2006
@@ -141,12 +141,9 @@
*
* @param doc
* The unsigned SOAP envelope as <code>Document</code>
- * @param crypto
- * An instance of the Crypto API to handle keystore and
- * certificates
* @throws WSSecurityException
*/
- public void prepare(Document doc, Crypto crypto)
+ public void prepare(Document doc)
throws WSSecurityException {
document = doc;
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java?rev=419284&r1=419283&r2=419284&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java Wed Jul 5 10:14:19 2006
@@ -146,7 +146,7 @@
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(ek, tokenIdentifier);
- Document encryptedDoc = encrBuilder.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrBuilder.build(doc, secHeader);
encrKeyBuilder.prependToHeader(secHeader);
encrKeyBuilder.prependBSTElementToHeader(secHeader);
@@ -187,7 +187,7 @@
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(ek, tokenIdentifier);
- Document encryptedDoc = encrBuilder.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrBuilder.build(doc, secHeader);
encrKeyBuilder.prependToHeader(secHeader);
encrKeyBuilder.prependBSTElementToHeader(secHeader);
@@ -223,7 +223,7 @@
WSSecDKSign sigBuilder = new WSSecDKSign();
sigBuilder.setExternalKey(ek, tokenIdentifier);
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
- Document signedDoc = sigBuilder.build(doc, crypto, secHeader);
+ Document signedDoc = sigBuilder.build(doc, secHeader);
encrKeyBuilder.prependToHeader(secHeader);
encrKeyBuilder.prependBSTElementToHeader(secHeader);
@@ -261,14 +261,13 @@
sigBuilder.setExternalKey(ek, tokenIdentifier);
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
log.info("Before HMAC-SHA1 signature");
- Document signedDoc = sigBuilder.build(doc, crypto, secHeader);
+ Document signedDoc = sigBuilder.build(doc, secHeader);
//Derived key signature
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(ek, tokenIdentifier);
- Document signedEncryptedDoc = encrBuilder.build(signedDoc, crypto,
- secHeader);
+ Document signedEncryptedDoc = encrBuilder.build(signedDoc, secHeader);
encrKeyBuilder.prependToHeader(secHeader);
encrKeyBuilder.prependBSTElementToHeader(secHeader);
@@ -307,15 +306,14 @@
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(ek, tokenIdentifier);
- encrBuilder.build(doc, crypto, secHeader);
+ encrBuilder.build(doc, secHeader);
//Derived key signature
WSSecDKSign sigBuilder = new WSSecDKSign();
sigBuilder.setExternalKey(ek, tokenIdentifier);
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
log.info("Before HMAC-SHA1 signature");
- Document encryptedSignedDoc = sigBuilder.build(doc, crypto,
- secHeader);
+ Document encryptedSignedDoc = sigBuilder.build(doc, secHeader);
encrKeyBuilder.prependToHeader(secHeader);
encrKeyBuilder.prependBSTElementToHeader(secHeader);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java?rev=419284&r1=419283&r2=419284&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java Wed Jul 5 10:14:19 2006
@@ -151,7 +151,7 @@
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(tempSecret, tokenId);
- encrBuilder.build(doc, crypto, secHeader);
+ encrBuilder.build(doc, secHeader);
sctBuilder.prependSCTElementToHeader(doc, secHeader);
@@ -189,7 +189,7 @@
WSSecDKSign sigBuilder = new WSSecDKSign();
sigBuilder.setExternalKey(tempSecret, tokenId);
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
- sigBuilder.build(doc, crypto, secHeader);
+ sigBuilder.build(doc, secHeader);
sctBuilder.prependSCTElementToHeader(doc, secHeader);
@@ -227,13 +227,13 @@
WSSecDKSign sigBuilder = new WSSecDKSign();
sigBuilder.setExternalKey(tempSecret, tokenId);
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
- sigBuilder.build(doc, crypto, secHeader);
+ sigBuilder.build(doc, secHeader);
// Derived key encryption
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(tempSecret, tokenId);
- encrBuilder.build(doc, crypto, secHeader);
+ encrBuilder.build(doc, secHeader);
sctBuilder.prependSCTElementToHeader(doc, secHeader);
@@ -272,13 +272,13 @@
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(tempSecret, tokenId);
- encrBuilder.build(doc, crypto, secHeader);
+ encrBuilder.build(doc, secHeader);
// Derived key signature
WSSecDKSign sigBuilder = new WSSecDKSign();
sigBuilder.setExternalKey(tempSecret, tokenId);
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
- sigBuilder.build(doc, crypto, secHeader);
+ sigBuilder.build(doc, secHeader);
sctBuilder.prependSCTElementToHeader(doc, secHeader);
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org