Author: ruchithf
Date: Sat Nov 24 06:31:54 2007
New Revision: 597851
URL: http://svn.apache.org/viewvc?rev=597851&view=rev
Log:
revert changes made in revision : 597786
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngineResult.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.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?rev=597851&r1=597850&r2=597851&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngineResult.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngineResult.java
Sat Nov 24 06:31:54 2007
@@ -147,15 +147,6 @@
"data-ref-uris";
/**
- * Tag denoting references the flag for asymmetric key encryption used in
- * encrypted key
- *
- * The value under this tag is of type Boolean
- */
- public static final java.lang.String TAG_ASYMM_KEY_ENCRYPTION =
- "asymm-key-encr";
-
- /**
* Tag denoting the X.509 certificate chain found, if applicable.
*
* The value under this tag is of type
java.security.cert.X509Certificate[].
@@ -218,15 +209,13 @@
byte[] decryptedKey,
byte[] encryptedKeyBytes,
String encyptedKeyId,
- List dataRefUris,
- boolean asymmEncryption
+ List dataRefUris
) {
put(TAG_ACTION, new Integer(act));
put(TAG_DECRYPTED_KEY, decryptedKey);
put(TAG_ENCRYPTED_EPHEMERAL_KEY, encryptedKeyBytes);
put(TAG_ENCRYPTED_KEY_ID, encyptedKeyId);
put(TAG_DATA_REF_URIS, dataRefUris);
- put(TAG_ASYMM_KEY_ENCRYPTION, new Boolean(asymmEncryption));
}
public WSSecurityEngineResult(int act, ArrayList dataRefUris) {
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?rev=597851&r1=597850&r2=597851&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/EncryptedKeyProcessor.java
Sat Nov 24 06:31:54 2007
@@ -62,12 +62,6 @@
private byte[] decryptedBytes = null;
private String encryptedKeyId = null;
-
- /**
- * A flag to indicate this key was encrypted with an
- * asymmetric key
- */
- private boolean asymmEncryption;
public void handleToken(Element elem, Crypto crypto, Crypto decCrypto,
CallbackHandler cb, WSDocInfo wsDocInfo, Vector returnResults, WSSConfig wsc)
throws WSSecurityException {
if (log.isDebugEnabled()) {
@@ -88,8 +82,7 @@
this.decryptedBytes,
this.encryptedEphemeralKey,
this.encryptedKeyId,
- dataRefUris,
- this.asymmEncryption));
+ dataRefUris));
}
public ArrayList handleEncryptedKey(Element xencEncryptedKey,
@@ -300,7 +293,6 @@
try {
cipher.init(Cipher.DECRYPT_MODE,
privateKey);
- this.asymmEncryption = true;
} catch (Exception e1) {
throw new WSSecurityException(WSSecurityException.FAILED_ENC_DEC,
null, null, e1);
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java?rev=597851&r1=597850&r2=597851&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
(original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/WSSecurityUtil.java
Sat Nov 24 06:31:54 2007
@@ -162,7 +162,7 @@
*/
public static Element findBodyElement(Document doc, SOAPConstants sc) {
Element soapBodyElement = (Element) WSSecurityUtil.getDirectChild(doc
- .getDocumentElement(), sc.getBodyQName().getLocalPart(), sc
+ .getFirstChild(), sc.getBodyQName().getLocalPart(), sc
.getEnvelopeURI());
return soapBodyElement;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
