extract key generation

laravel · Jul 3, 2017 · 6623996 · 6623996
1 parent 02ccd2e
commit 6623996
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/Illuminate/Encryption/Encrypter.php b/src/Illuminate/Encryption/Encrypter.php
@@ -59,6 +59,17 @@ public static function supported($key, $cipher)
                ($cipher === 'AES-256-CBC' && $length === 32);
     }
 
+    /**
+     * Create a new encryption key for the given cipher.
+     *
+     * @param  string  $cipher
+     * @return string
+     */
+    public static function generateKey($cipher)
+    {
+        return random_bytes($cipher == 'AES-128-CBC' ? 16 : 32);
+    }
+
     /**
      * Encrypt the given value.
      *

diff --git a/src/Illuminate/Foundation/Console/KeyGenerateCommand.php b/src/Illuminate/Foundation/Console/KeyGenerateCommand.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Foundation\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Encryption\Encrypter;
 use Illuminate\Console\ConfirmableTrait;
 
 class KeyGenerateCommand extends Command
@@ -57,9 +58,9 @@ public function handle()
      */
     protected function generateRandomKey()
     {
-        return 'base64:'.base64_encode(random_bytes(
-            $this->laravel['config']['app.cipher'] == 'AES-128-CBC' ? 16 : 32
-        ));
+        return 'base64:'.base64_encode(
+            Encrypter::generateKey($this->laravel['config']['app.cipher'])
+        );
     }
 
     /**