[idwsfconsumer] branch master updated: OSJ-287 - Get off Santuario Base64 encoder class

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository idwsfconsumer.

View the commit online:
http://git.shibboleth.net/view/?p=idwsfconsumer.git;a=commit;h=f983cf8d6e5d11f920b5cd1bc52249b8fc7e3d59

The following commit(s) were added to refs/heads/master by this push:
       new  f983cf8   OSJ-287 - Get off Santuario Base64 encoder class
f983cf8 is described below

commit f983cf8d6e5d11f920b5cd1bc52249b8fc7e3d59
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 17 19:48:50 2019 -0400

    OSJ-287 - Get off Santuario Base64 encoder class
    
    https://issues.shibboleth.net/jira/browse/OSJ-287
---
 src/main/java/org/openliberty/wsc/AuthenticationService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/openliberty/wsc/AuthenticationService.java b/src/main/java/org/openliberty/wsc/AuthenticationService.java
index 3fae249..bb935c6 100644
--- a/src/main/java/org/openliberty/wsc/AuthenticationService.java
+++ b/src/main/java/org/openliberty/wsc/AuthenticationService.java
@@ -6,11 +6,11 @@ import javax.crypto.Mac;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
+import net.shibboleth.utilities.java.support.codec.Base64Support;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.log4j.Logger;
-import org.apache.xml.security.utils.Base64;
 import org.openliberty.xmltooling.sasl.Data;
 import org.openliberty.xmltooling.sasl.DataBuilder;
 import org.openliberty.xmltooling.sasl.SASLRequest;
@@ -207,7 +207,7 @@ public class AuthenticationService extends BaseServiceClient
          *  
          */
         Data data = new DataBuilder().buildObject();
-        String base64AuthToken = Base64.encode(('\0'+username+'\0'+password).getBytes());
+        String base64AuthToken = Base64Support.encode(('\0'+username+'\0'+password).getBytes(), false);
         data.setValue(base64AuthToken);
         request.setData(data);
 
@@ -362,7 +362,7 @@ public class AuthenticationService extends BaseServiceClient
         // add the encoded username/password string to a Data element
         Data data = new DataBuilder().buildObject();
 
-        data.setValue(Base64.encode( buff.toString().getBytes() ));
+        data.setValue(Base64Support.encode(buff.toString().getBytes(), false));
         
         SASLRequest stage2Request = requestBuilder.buildObject();
         stage2Request.setMechanism(AuthMechanism.CRAM_MD5.code);          

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.