dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix interpretation of "A-type" password hashes
[lhc/web/wiklou.git]
/
includes
/
password
/
MWOldPassword.php
diff --git
a/includes/password/MWOldPassword.php
b/includes/password/MWOldPassword.php
index
84675c1
..
360485e
100644
(file)
--- a/
includes/password/MWOldPassword.php
+++ b/
includes/password/MWOldPassword.php
@@
-36,14
+36,8
@@
class MWOldPassword extends ParameterizedPassword {
}
public function crypt( $plaintext ) {
}
public function crypt( $plaintext ) {
- global $wgPasswordSalt;
-
- if ( $wgPasswordSalt && count( $this->args ) === 1 ) {
- $this->hash = md5( $this->args[0] . '-' . md5( $plaintext ) );
- } else {
- $this->args = [];
- $this->hash = md5( $plaintext );
- }
+ $this->args = [];
+ $this->hash = md5( $plaintext );
if ( !is_string( $this->hash ) || strlen( $this->hash ) < 32 ) {
throw new PasswordError( 'Error when hashing password.' );
if ( !is_string( $this->hash ) || strlen( $this->hash ) < 32 ) {
throw new PasswordError( 'Error when hashing password.' );