slight adjustment to hashing

laravel · Jul 27, 2020 · c9ce261 · c9ce261 · Tofandel · Sep 25, 2020
1 parent 3c13945
commit c9ce261
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Illuminate/Cookie/Middleware/EncryptCookies.php b/src/Illuminate/Cookie/Middleware/EncryptCookies.php
@@ -83,7 +83,7 @@ protected function decrypt(Request $request)
                 $value = $this->decryptCookie($key, $cookie);
 
                 $request->cookies->set(
-                    $key, strpos($value, sha1($key.'v2').'|') !== 0 ? null : substr($value, 41)
+                    $key, strpos($value, hash_hmac('sha1', $key.'v2', $this->encrypter->getKey()).'|') !== 0 ? null : substr($value, 41)
                 );
             } catch (DecryptException $e) {
                 $request->cookies->set($key, null);

diff --git a/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php b/src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php
@@ -561,7 +561,7 @@ protected function prepareCookiesForRequest()
         }
 
         return collect($this->defaultCookies)->map(function ($value, $key) {
-            return encrypt(sha1($key.'v2').'|'.$value, false);
+            return encrypt(hash_hmac('sha1', $key.'v2', base64_decode(substr(config('app.key'), 7))).'|'.$value, false);
         })->merge($this->unencryptedCookies)->all();
     }