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 we...@apache.org on 2006/03/11 22:27:28 UTC
svn commit: r385174 -
/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
Author: werner
Date: Sat Mar 11 13:27:27 2006
New Revision: 385174
URL: http://svn.apache.org/viewcvs?rev=385174&view=rev
Log:
Clean up code to reflect modifications in *.message.* code.
Modified:
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java?rev=385174&r1=385173&r2=385174&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java Sat Mar 11 13:27:27 2006
@@ -134,18 +134,18 @@
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setEncryptionUser("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss4jcert");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.build(doc, crypto, secHeader);
//Key information from the EncryptedKey
byte[] ek = encrKeyBuilder.getEphemeralKey();
- String tokneIdentifier = encrKeyBuilder.getTokneIdentifier();
+ String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
- encrBuilder.setExternalKey(ek, tokneIdentifier);
+ encrBuilder.setExternalKey(ek, tokenIdentifier);
Document encryptedDoc = encrBuilder.build(doc, crypto, secHeader);
encrKeyBuilder.commit(encryptedDoc, crypto, secHeader);
@@ -173,18 +173,18 @@
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setEncryptionUser("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss4jcert");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.build(doc, crypto, secHeader);
//Key information from the EncryptedKey
byte[] ek = encrKeyBuilder.getEphemeralKey();
- String tokneIdentifier = encrKeyBuilder.getTokneIdentifier();
+ String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
- encrBuilder.setExternalKey(ek, tokneIdentifier);
+ encrBuilder.setExternalKey(ek, tokenIdentifier);
Document encryptedDoc = encrBuilder.build(doc, crypto, secHeader);
encrKeyBuilder.commit(encryptedDoc, crypto, secHeader);
@@ -208,17 +208,17 @@
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setEncryptionUser("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss4jcert");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.build(doc, crypto, secHeader);
//Key information from the EncryptedKey
byte[] ek = encrKeyBuilder.getEphemeralKey();
- String tokneIdentifier = encrKeyBuilder.getTokneIdentifier();
+ String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
WSSecDKSign sigBuilder = new WSSecDKSign();
- sigBuilder.setExternalKey(ek, tokneIdentifier);
+ sigBuilder.setExternalKey(ek, tokenIdentifier);
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
Document signedDoc = sigBuilder.build(doc, crypto, secHeader);
@@ -244,17 +244,17 @@
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setEncryptionUser("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss4jcert");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.build(doc, crypto, secHeader);
//Key information from the EncryptedKey
byte[] ek = encrKeyBuilder.getEphemeralKey();
- String tokneIdentifier = encrKeyBuilder.getTokneIdentifier();
+ String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
WSSecDKSign sigBuilder = new WSSecDKSign();
- sigBuilder.setExternalKey(ek, tokneIdentifier);
+ 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);
@@ -262,7 +262,7 @@
//Derived key signature
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
- encrBuilder.setExternalKey(ek, tokneIdentifier);
+ encrBuilder.setExternalKey(ek, tokenIdentifier);
Document signedEncryptedDoc = encrBuilder.build(signedDoc, crypto,
secHeader);
@@ -290,23 +290,23 @@
//EncryptedKey
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
- encrKeyBuilder.setEncryptionUser("wss4jcert");
+ encrKeyBuilder.setUserInfo("wss4jcert");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.build(doc, crypto, secHeader);
//Key information from the EncryptedKey
byte[] ek = encrKeyBuilder.getEphemeralKey();
- String tokneIdentifier = encrKeyBuilder.getTokneIdentifier();
+ String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
- encrBuilder.setExternalKey(ek, tokneIdentifier);
+ encrBuilder.setExternalKey(ek, tokenIdentifier);
Document encryptedDoc = encrBuilder.build(doc, crypto, secHeader);
//Derived key signature
WSSecDKSign sigBuilder = new WSSecDKSign();
- sigBuilder.setExternalKey(ek, tokneIdentifier);
+ sigBuilder.setExternalKey(ek, tokenIdentifier);
sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
log.info("Before HMAC-SHA1 signature");
Document encryptedSignedDoc = sigBuilder.build(encryptedDoc, crypto,
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org