Merge MC-36790 into cia-2.3.7

Author: dvoskoboinikov

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

@@ -219,12 +219,14 @@ public function getHash($password, $salt = false, $version = self::HASH_VERSION_
         }
 
         if ($isArgon) {
+            //phpcs:disable PHPCompatibility.Constants.NewConstants
             $seedBytes = SODIUM_CRYPTO_SIGN_SEEDBYTES;
             $opsLimit = SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE;
             $memLimit = SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE;
             if ($version === self::HASH_VERSION_ARGON2ID13_AGNOSTIC) {
                 $version = implode('_', [self::HASH_VERSION_ARGON2ID13_AGNOSTIC, $seedBytes, $opsLimit, $memLimit]);
             }
+            //phpcs:enable PHPCompatibility.Constants.NewConstants
 
             $hash = $this->getArgonHash($password, $seedBytes, $opsLimit, $memLimit, $salt);
         } else {
@@ -302,13 +304,15 @@ public function isValidHash($password, $hash)
                         $hashSalt
                     );
                 } elseif ((int)$hashVersion === self::HASH_VERSION_ARGON2ID13) {
+                    //phpcs:disable PHPCompatibility.Constants.NewConstants
                     $recreated = $this->getArgonHash(
                         $recreated,
                         SODIUM_CRYPTO_SIGN_SEEDBYTES,
                         SODIUM_CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE,
                         SODIUM_CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE,
                         $hashSalt
                     );
+                    //phpcs:enable PHPCompatibility.Constants.NewConstants
                 } else {
                     $recreated = $this->generateSimpleHash($hashSalt . $recreated, (int)$hashVersion);
                 }
@@ -586,6 +590,7 @@ private function getArgonHash(
         int $memLimit,
         string $salt
     ): string {
+        //phpcs:disable PHPCompatibility.Constants.NewConstants
         if (strlen($salt) < SODIUM_CRYPTO_PWHASH_SALTBYTES) {
             $salt = str_pad($salt, SODIUM_CRYPTO_PWHASH_SALTBYTES, $salt);
         } elseif (strlen($salt) > SODIUM_CRYPTO_PWHASH_SALTBYTES) {
@@ -602,5 +607,6 @@ private function getArgonHash(
                 SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13
             )
         );
+        //phpcs:enable PHPCompatibility.Constants.NewConstants
     }
 }

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

@@ -96,6 +96,7 @@ public function testGetHashSpecifiedSalt(): void
      */
     public function testGetHashRandomSaltDefaultLength(): void
     {
+        //phpcs:disable PHPCompatibility.Constants.NewConstants
         $salt = 'random-salt';
         $salt = str_pad(
             $salt,
@@ -116,6 +117,7 @@ public function testGetHashRandomSaltDefaultLength(): void
             ->willReturn($salt);
         $actual = $this->encryptor->getHash('password', true, $version);
         $this->assertEquals($expected, $actual);
+        //phpcs:enable PHPCompatibility.Constants.NewConstants
     }
 
     /**