You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/01/23 18:41:44 UTC
svn commit: r737115 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH:
ChangeLog src/com/ecyrd/jspwiki/Release.java
src/com/ecyrd/jspwiki/util/CryptoUtil.java
Author: metskem
Date: Fri Jan 23 09:41:44 2009
New Revision: 737115
URL: http://svn.apache.org/viewvc?rev=737115&view=rev
Log:
2.8.2-svn-6 JSPWIKI-472, userdatabase.xml corrupted on EBCDIC platforms by CryptoUtil
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/util/CryptoUtil.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=737115&r1=737114&r2=737115&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Fri Jan 23 09:41:44 2009
@@ -1,3 +1,9 @@
+2009-01-23 Harry Metske <me...@apache.org>
+
+ * 2.8.2-svn-6
+
+ * JSPWIKI-472, userdatabase.xml corrupted on EBCDIC platforms by CryptoUtil
+
2009-01-21 Andrew Jaquith <ajaquith AT apache DOT org>
* 2.8.2-svn-5
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=737115&r1=737114&r2=737115&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Fri Jan 23 09:41:44 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "5";
+ public static final String BUILD = "6";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/util/CryptoUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/util/CryptoUtil.java?rev=737115&r1=737114&r2=737115&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/util/CryptoUtil.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/util/CryptoUtil.java Fri Jan 23 09:41:44 2009
@@ -28,6 +28,7 @@
import java.util.Random;
import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
/**
* Hashes and verifies salted SHA-1 passwords, which are compliant with RFC
@@ -35,6 +36,7 @@
*/
public final class CryptoUtil
{
+ private static final Logger log = Logger.getLogger( CryptoUtil.class );
private static final String SSHA = "{SSHA}";
@@ -184,7 +186,17 @@
all[hash.length + i] = salt[i];
}
byte[] base64 = Base64.encodeBase64( all );
- return SSHA + new String( base64 );
+
+ String saltedString = null;
+ try
+ {
+ saltedString = SSHA + new String( base64, "UTF8" );
+ }
+ catch( UnsupportedEncodingException e )
+ {
+ log.fatal( "You do not have UTF-8!?!" );
+ }
+ return saltedString;
}
/**