Merge MC-36790 into cia-2.3.7

dvoskoboinikov · web-flow · commit 81d0450e86ae · 2020-10-07T10:52:35.000-05:00
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -591,6 +591,7 @@ private function getArgonHash(
         string $salt
     ): string {
         //phpcs:disable PHPCompatibility.Constants.NewConstants
+        //phpcs:disable PHPCompatibility.FunctionUse.NewFunctions
         if (strlen($salt) < SODIUM_CRYPTO_PWHASH_SALTBYTES) {
             $salt = str_pad($salt, SODIUM_CRYPTO_PWHASH_SALTBYTES, $salt);
         } elseif (strlen($salt) > SODIUM_CRYPTO_PWHASH_SALTBYTES) {
@@ -607,6 +608,7 @@ private function getArgonHash(
                 SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13
             )
         );
+        //phpcs:enable PHPCompatibility.FunctionUse.NewFunctions
         //phpcs:enable PHPCompatibility.Constants.NewConstants
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -591,6 +591,7 @@ private function getArgonHash(`
`591`	`591`	`string $salt`
`592`	`592`	`): string {`
`593`	`593`	`//phpcs:disable PHPCompatibility.Constants.NewConstants`
	`594`	`+ //phpcs:disable PHPCompatibility.FunctionUse.NewFunctions`
`594`	`595`	`if (strlen($salt) < SODIUM_CRYPTO_PWHASH_SALTBYTES) {`
`595`	`596`	`$salt = str_pad($salt, SODIUM_CRYPTO_PWHASH_SALTBYTES, $salt);`
`596`	`597`	`} elseif (strlen($salt) > SODIUM_CRYPTO_PWHASH_SALTBYTES) {`
`@@ -607,6 +608,7 @@ private function getArgonHash(`
`607`	`608`	`SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13`
`608`	`609`	`)`
`609`	`610`	`);`
	`611`	`+ //phpcs:enable PHPCompatibility.FunctionUse.NewFunctions`
`610`	`612`	`//phpcs:enable PHPCompatibility.Constants.NewConstants`
`611`	`613`	`}`
`612`	`614`	`}`