Merge remote-tracking branch 'mainline/develop' into 2.4-develop-jet-pr1

zakdma · zakdma · commit c013a571e594 · 2021-04-23T10:38:03.000+03:00
diff --git a/TwoFactorAuth/Model/Provider/Engine/Google.php b/TwoFactorAuth/Model/Provider/Engine/Google.php
@@ -98,7 +98,10 @@ public function __construct(
     private function generateSecret(): string
     {
         $secret = random_bytes(128);
-        return preg_replace('/[^A-Za-z0-9]/', '', Base32::encode($secret));
+        // seed for iOS devices to avoid errors with barcode
+        $seed = 'abcd';
+
+        return preg_replace('/[^A-Za-z0-9]/', '', Base32::encode($seed . $secret));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,10 @@ public function __construct(`
`98`	`98`	`private function generateSecret(): string`
`99`	`99`	`{`
`100`	`100`	`$secret = random_bytes(128);`
`101`		`- return preg_replace('/[^A-Za-z0-9]/', '', Base32::encode($secret));`
	`101`	`+ // seed for iOS devices to avoid errors with barcode`
	`102`	`+ $seed = 'abcd';`
	`103`	`+`
	`104`	`+ return preg_replace('/[^A-Za-z0-9]/', '', Base32::encode($seed . $secret));`
`102`	`105`	`}`
`103`	`106`
`104`	`107`	`/**`