Merge "SpecialMyLanguage: Get content language from service"

[lhc/web/wiklou.git] / includes / password / Pbkdf2Password.php

diff --git a/includes/password/Pbkdf2Password.php b/includes/password/Pbkdf2Password.php
index 4a8831e..6065045 100644 (file)
--- a/includes/password/Pbkdf2Password.php
+++ b/includes/password/Pbkdf2Password.php
@@ -42,13 +42,12 @@ class Pbkdf2Password extends ParameterizedPassword {
        }
 
        protected function shouldUseHashExtension() {
-               return isset( $this->config['use-hash-extension'] ) ?
-                       $this->config['use-hash-extension'] : function_exists( 'hash_pbkdf2' );
+               return $this->config['use-hash-extension'] ?? function_exists( 'hash_pbkdf2' );
        }
 
        public function crypt( $password ) {
                if ( count( $this->args ) == 0 ) {
-                       $this->args[] = base64_encode( MWCryptRand::generate( 16, true ) );
+                       $this->args[] = base64_encode( random_bytes( 16 ) );
                }
 
                if ( $this->shouldUseHashExtension() ) {