Merge remote-tracking branch 'origin/MC-19686' into 2.3-develop-pr80

Author: svitja

lib/internal/Magento/Framework/Encryption/Encryptor.php

@@ -273,11 +273,12 @@ public function isValidHash($password, $hash)
     {
         try {
             $this->explodePasswordHash($hash);
+            $recreated = $password;
             foreach ($this->getPasswordVersion() as $hashVersion) {
                 if ($hashVersion === self::HASH_VERSION_ARGON2ID13) {
-                    $recreated = $this->getArgonHash($password, $this->getPasswordSalt());
+                    $recreated = $this->getArgonHash($recreated, $this->getPasswordSalt());
                 } else {
-                    $recreated = $this->generateSimpleHash($this->getPasswordSalt() . $password, $hashVersion);
+                    $recreated = $this->generateSimpleHash($this->getPasswordSalt() . $recreated, $hashVersion);
                 }
                 $hash = $this->getPasswordHash();
             }

lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php

@@ -152,6 +152,7 @@ public function validateHashDataProvider(): array
             ['password', 'hash:salt:1', false],
             ['password', '67a1e09bb1f83f5007dc119c14d663aa:salt:0', true],
             ['password', '13601bda4ea78e55a07b98866d2be6be0744e3866f13c00c811cab608a28f322:salt:1', true],
+            ['password', 'c6aad9e058f6c4b06187c06d2b69bf506a786af030f81fb6d83778422a68205e:salt:1:2', true],
         ];
     }