Opcache Optimisations for Argon2iPasswordEncoder

zanbaldwin · zanbaldwin · commit 68077139614c · 2017-09-28T14:35:23.000+01:00
diff --git a/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php
@@ -22,9 +22,9 @@ class Argon2iPasswordEncoder extends BasePasswordEncoder implements SelfSaltingE
 {
     public static function isSupported()
     {
-        return function_exists('sodium_crypto_pwhash_str')
-            || extension_loaded('libsodium')
-            || (\PHP_VERSION_ID >= 70200 && defined('PASSWORD_ARGON2I'));
+        return (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I'))
+            || \function_exists('sodium_crypto_pwhash_str')
+            || \extension_loaded('libsodium');
     }
 
     /**
@@ -36,13 +36,13 @@ public function encodePassword($raw, $salt)
             throw new BadCredentialsException('Invalid password.');
         }
 
-        if (\PHP_VERSION_ID >= 70200 && defined('PASSWORD_ARGON2I')) {
+        if (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I')) {
             return $this->encodePasswordNative($raw);
         }
-        if (function_exists('sodium_crypto_pwhash_str')) {
+        if (\function_exists('sodium_crypto_pwhash_str')) {
             return $this->encodePasswordSodiumFunction($raw);
         }
-        if (extension_loaded('libsodium')) {
+        if (\extension_loaded('libsodium')) {
             return $this->encodePasswordSodiumExtension($raw);
         }
 
@@ -54,16 +54,16 @@ public function encodePassword($raw, $salt)
      */
     public function isPasswordValid($encoded, $raw, $salt)
     {
-        if (\PHP_VERSION_ID >= 70200 && defined('PASSWORD_ARGON2I')) {
+        if (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I')) {
             return !$this->isPasswordTooLong($raw) && password_verify($raw, $encoded);
         }
-        if (function_exists('sodium_crypto_pwhash_str_verify')) {
+        if (\function_exists('sodium_crypto_pwhash_str_verify')) {
             $valid = !$this->isPasswordTooLong($raw) && \sodium_crypto_pwhash_str_verify($encoded, $raw);
             \sodium_memzero($raw);
 
             return $valid;
         }
-        if (extension_loaded('libsodium')) {
+        if (\extension_loaded('libsodium')) {
             $valid = !$this->isPasswordTooLong($raw) && \Sodium\crypto_pwhash_str_verify($encoded, $raw);
             \Sodium\memzero($raw);
 

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ class Argon2iPasswordEncoder extends BasePasswordEncoder implements SelfSaltingE`
`22`	`22`	`{`
`23`	`23`	`public static function isSupported()`
`24`	`24`	`{`
`25`		`- return function_exists('sodium_crypto_pwhash_str')`
`26`		`- \|\| extension_loaded('libsodium')`
`27`		`- \|\| (\PHP_VERSION_ID >= 70200 && defined('PASSWORD_ARGON2I'));`
	`25`	`+ return (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I'))`
	`26`	`+ \|\| \function_exists('sodium_crypto_pwhash_str')`
	`27`	`+ \|\| \extension_loaded('libsodium');`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`
`@@ -36,13 +36,13 @@ public function encodePassword($raw, $salt)`
`36`	`36`	`throw new BadCredentialsException('Invalid password.');`
`37`	`37`	`}`
`38`	`38`
`39`		`- if (\PHP_VERSION_ID >= 70200 && defined('PASSWORD_ARGON2I')) {`
	`39`	`+ if (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I')) {`
`40`	`40`	`return $this->encodePasswordNative($raw);`
`41`	`41`	`}`
`42`		`- if (function_exists('sodium_crypto_pwhash_str')) {`
	`42`	`+ if (\function_exists('sodium_crypto_pwhash_str')) {`
`43`	`43`	`return $this->encodePasswordSodiumFunction($raw);`
`44`	`44`	`}`
`45`		`- if (extension_loaded('libsodium')) {`
	`45`	`+ if (\extension_loaded('libsodium')) {`
`46`	`46`	`return $this->encodePasswordSodiumExtension($raw);`
`47`	`47`	`}`
`48`	`48`
`@@ -54,16 +54,16 @@ public function encodePassword($raw, $salt)`
`54`	`54`	`*/`
`55`	`55`	`public function isPasswordValid($encoded, $raw, $salt)`
`56`	`56`	`{`
`57`		`- if (\PHP_VERSION_ID >= 70200 && defined('PASSWORD_ARGON2I')) {`
	`57`	`+ if (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I')) {`
`58`	`58`	`return !$this->isPasswordTooLong($raw) && password_verify($raw, $encoded);`
`59`	`59`	`}`
`60`		`- if (function_exists('sodium_crypto_pwhash_str_verify')) {`
	`60`	`+ if (\function_exists('sodium_crypto_pwhash_str_verify')) {`
`61`	`61`	`$valid = !$this->isPasswordTooLong($raw) && \sodium_crypto_pwhash_str_verify($encoded, $raw);`
`62`	`62`	`\sodium_memzero($raw);`
`63`	`63`
`64`	`64`	`return $valid;`
`65`	`65`	`}`
`66`		`- if (extension_loaded('libsodium')) {`
	`66`	`+ if (\extension_loaded('libsodium')) {`
`67`	`67`	`$valid = !$this->isPasswordTooLong($raw) && \Sodium\crypto_pwhash_str_verify($encoded, $raw);`
`68`	`68`	`\Sodium\memzero($raw);`
`69`	`69`