Merge branch '3.3.x'

2025-07-31 14:00:31 +02:00 · 2019-07-27 16:30:30 +02:00
parent f3cad544e7 ee51bf26fa
commit 5c472e4a9c
4 changed files with 44 additions and 0 deletions
--- a/phpBB/config/default/container/parameters.yml
+++ b/phpBB/config/default/container/parameters.yml
@@ -14,6 +14,7 @@ parameters:

    # List of default password driver types
    passwords.algorithms:
+        - passwords.driver.argon2id
        - passwords.driver.argon2i
        - passwords.driver.bcrypt_2y
        - passwords.driver.bcrypt
--- a/phpBB/config/default/container/services_password.yml
+++ b/phpBB/config/default/container/services_password.yml
@@ -41,6 +41,12 @@ services:
        tags:
            - { name: passwords.driver }

+    passwords.driver.argon2id:
+        class: phpbb\passwords\driver\argon2id
+        parent: passwords.driver.argon2i
+        tags:
+            - { name: passwords.driver }
+
    passwords.driver.bcrypt:
        class: phpbb\passwords\driver\bcrypt
        arguments: