Author: werner
Date: Wed Sep  7 13:54:24 2005
New Revision: 279418

URL: http://svn.apache.org/viewcvs?rev=279418&view=rev
Log:
Insert fix to handle default Encoding to be base64. Same as for 1.1.0 Final by 
Dims

Modified:
    
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/BinarySecurity.java
    
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java

Modified: 
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/BinarySecurity.java
URL: 
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/BinarySecurity.java?rev=279418&r1=279417&r2=279418&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/BinarySecurity.java
 (original)
+++ 
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/BinarySecurity.java
 Wed Sep  7 13:54:24 2005
@@ -54,7 +54,8 @@
         if (!el.equals(TOKEN) && !el.equals(TOKEN_KI)) {
             throw new 
WSSecurityException(WSSecurityException.INVALID_SECURITY_TOKEN, "badTokenType", 
new Object[]{el});
         }
-        if (!getEncodingType().equals(BASE64_ENCODING)) {
+        String encoding = getEncodingType();
+        if (encoding.length() > 0 && !encoding.equals(BASE64_ENCODING)) {
             throw new 
WSSecurityException(WSSecurityException.INVALID_SECURITY_TOKEN, "badEncoding", 
new Object[]{getEncodingType()});
         }
     }

Modified: 
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java
URL: 
http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java?rev=279418&r1=279417&r2=279418&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java
 (original)
+++ 
webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java
 Wed Sep  7 13:54:24 2005
@@ -284,7 +284,7 @@
                 certs[0] = cert;
                 return certs;
             }
-        } else if (value.equals(SKI_URI)) {
+        } else if (SKI_URI.equals(value)) {
             String alias = getX509SKIAlias(crypto);
             if (alias != null) {
                 return crypto.getCertificates(alias);



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to