You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2021/04/24 09:26:56 UTC
[jspwiki] 03/09: refactor: Rename getOldHash private method to
getShaHash
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit c7810eabc9c6735f45b0915aeb1f155aab5e70d8
Author: samhareem <sa...@museoliitto.fi>
AuthorDate: Wed Mar 24 17:54:07 2021 +0200
refactor: Rename getOldHash private method to getShaHash
---
.../main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
index d1a2194..71982d4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
@@ -202,7 +202,7 @@ public abstract class AbstractUserDatabase implements UserDatabase {
// Use older verification algorithm if password is stored as SHA
if( storedPassword.startsWith( SHA_PREFIX ) ) {
storedPassword = storedPassword.substring( SHA_PREFIX.length() );
- hashedPassword = getOldHash( password );
+ hashedPassword = getShaHash( password );
verified = hashedPassword.equals( storedPassword );
}
@@ -270,7 +270,8 @@ public abstract class AbstractUserDatabase implements UserDatabase {
* @return the result hash
* @deprecated this method is retained for backwards compatibility purposes; use {@link #getHash(String, String)} instead
*/
- String getOldHash( final String text ) {
+ @Deprecated
+ String getShaHash(final String text ) {
try {
final MessageDigest md = MessageDigest.getInstance( "SHA" );
md.update( text.getBytes( StandardCharsets.UTF_8 ) );