Merge pull request chriskacerguis#542 from kenjis/fix_generate_key

chriskacerguis · chriskacerguis · commit 8eccc3d8d077 · 2015-09-12T07:00:47.000-05:00
Fix _generate_key() method. See chriskacerguis#535
diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
@@ -213,7 +213,7 @@ private function _generate_key()
         do
         {
             // Generate a random salt
-            $salt = $this->security->get_random_bytes(64);
+            $salt = base_convert(bin2hex($this->security->get_random_bytes(64)), 16, 36);
 
             // If an error occurred, then fall back to the previous method
             if ($salt === FALSE)

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ private function _generate_key()`
`213`	`213`	`do`
`214`	`214`	`{`
`215`	`215`	`// Generate a random salt`
`216`		`- $salt = $this->security->get_random_bytes(64);`
	`216`	`+ $salt = base_convert(bin2hex($this->security->get_random_bytes(64)), 16, 36);`
`217`	`217`
`218`	`218`	`// If an error occurred, then fall back to the previous method`
`219`	`219`	`if ($salt === FALSE)`