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
Merge "Hard deprecate Password::equals()"
[lhc/web/wiklou.git]
/
includes
/
password
/
EncryptedPassword.php
diff --git
a/includes/password/EncryptedPassword.php
b/includes/password/EncryptedPassword.php
index
0ea3c63
..
d1774ba
100644
(file)
--- a/
includes/password/EncryptedPassword.php
+++ b/
includes/password/EncryptedPassword.php
@@
-60,7
+60,7
@@
class EncryptedPassword extends ParameterizedPassword {
if ( count( $this->args ) ) {
$iv = base64_decode( $this->args[0] );
} else {
if ( count( $this->args ) ) {
$iv = base64_decode( $this->args[0] );
} else {
- $iv =
MWCryptRand::generate( openssl_cipher_iv_length( $this->params['cipher'] ), true
);
+ $iv =
random_bytes( openssl_cipher_iv_length( $this->params['cipher'] )
);
}
$this->hash = openssl_encrypt(
}
$this->hash = openssl_encrypt(
@@
-102,7
+102,7
@@
class EncryptedPassword extends ParameterizedPassword {
$this->params = $this->getDefaultParams();
// Check the key size with the new params
$this->params = $this->getDefaultParams();
// Check the key size with the new params
- $iv =
MWCryptRand::generate( openssl_cipher_iv_length( $this->params['cipher'] ), true
);
+ $iv =
random_bytes( openssl_cipher_iv_length( $this->params['cipher'] )
);
$this->hash = openssl_encrypt(
$underlyingHash,
$this->params['cipher'],
$this->hash = openssl_encrypt(
$underlyingHash,
$this->params['cipher'],