Author: dims
Date: Wed Sep  7 12:40:55 2005
New Revision: 279405

URL: http://svn.apache.org/viewcvs?rev=279405&view=rev
Log:
- WSS defines the default Encoding to be base64, so if nothing is present 
that's ok.
- Add missing entry for badEncoding in errors.properties


Modified:
    
webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/components/crypto/errors.properties
    
webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java

Modified: 
webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/components/crypto/errors.properties
URL: 
http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/components/crypto/errors.properties?rev=279405&r1=279404&r2=279405&view=diff
==============================================================================
--- 
webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/components/crypto/errors.properties
 (original)
+++ 
webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/components/crypto/errors.properties
 Wed Sep  7 12:40:55 2005
@@ -15,4 +15,5 @@
 noCerts00 = No certificates loaded
 noKey00 = No private key loaded
 noSKIHandling = Problem with SKI information: {0}
-badBase64Data = Unable to decode Base64 encoded data
\ No newline at end of file
+badBase64Data = Unable to decode Base64 encoded data
+badEncoding = Problem with Encoding: {0}

Modified: 
webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java
URL: 
http://svn.apache.org/viewcvs/webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java?rev=279405&r1=279404&r2=279405&view=diff
==============================================================================
--- 
webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java
 (original)
+++ 
webservices/wss4j/branches/WSS4J_1_1_0_FINAL/src/org/apache/ws/security/message/token/BinarySecurity.java
 Wed Sep  7 12:40:55 2005
@@ -71,7 +71,8 @@
             QName el = new QName(this.element.getNamespaceURI(), 
this.element.getLocalName());
             throw new 
WSSecurityException(WSSecurityException.INVALID_SECURITY_TOKEN, "badTokenType", 
new Object[]{el});
         }
-        if (!getEncodingType().endsWith(BASE64_BINARY)) {
+        String encoding = getEncodingType();
+        if (encoding.length() > 0 && !encoding.endsWith(BASE64_BINARY)) {
             throw new 
WSSecurityException(WSSecurityException.INVALID_SECURITY_TOKEN, "badEncoding", 
new Object[]{getEncodingType()});
         }
     }



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

Reply via email to