You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/08/11 22:09:32 UTC
cvs commit: jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security BaseSecurityService.java
dlr 01/08/11 13:09:32
Modified: src/services/java/org/apache/fulcrum/security
BaseSecurityService.java
Log:
Traded JavaMail dependency for dependency on Commons Util base64
encoding.
Revision Changes Path
1.3 +7 -10 jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/BaseSecurityService.java
Index: BaseSecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/BaseSecurityService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- BaseSecurityService.java 2001/08/02 05:31:12 1.2
+++ BaseSecurityService.java 2001/08/11 20:09:32 1.3
@@ -73,11 +73,10 @@
import org.apache.torque.util.Criteria;
// Classes needed for password encryption
-import javax.mail.internet.MimeUtility;
import java.security.MessageDigest;
-import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
+import org.apache.commons.util.Base64;
+
/**
* This is a common subset of SecurityService implementation.
*
@@ -94,7 +93,7 @@
* </ul>
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: BaseSecurityService.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
+ * @version $Id: BaseSecurityService.java,v 1.3 2001/08/11 20:09:32 dlr Exp $
*/
public abstract class BaseSecurityService
extends BaseService
@@ -160,13 +159,11 @@
// We need to use unicode here, to be independent of platform's
// default encoding. Thanks to SGawin for spotting this.
byte[] digest = md.digest(password.getBytes("UTF-8"));
-
- ByteArrayOutputStream bas = new ByteArrayOutputStream(
- digest.length + digest.length / 3 + 1);
- OutputStream encodedStream = MimeUtility.encode(bas, "base64");
- encodedStream.write(digest);
- return bas.toString();
+ // Base64-encode the digest.
+ byte[] encodedDigest = Base64.encode(digest);
+ return (encodedDigest == null ? null :
+ new String(encodedDigest));
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org