Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui3: update crypto to version 3 (GCM+PBKDF2) by default #1837

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/v2.0/admin/configuration/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -1938,8 +1938,8 @@ If you want to find out the expiry timer for your SAML Identity Provider install
* __recommend_leaving_at_default:__ true
* __mandatory:__ no
* __type:__ int
* __default:__ 1
* __available:__ since version 2.6
* __default:__ 3
* __available:__ updated in 3.0 beta7 an above to 3, was 1 since version 2.6
* __comment:__


Expand Down
3 changes: 2 additions & 1 deletion includes/ConfigDefaults.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,8 @@

// see crypto_app.js for constants in the range crypto_key_version_constants
// Generally higher is newer + better.
'encryption_key_version_new_files' => 1,
// UI3 has changed from '1' to '3' as the default (AES-GCM + PBKDF2)
'encryption_key_version_new_files' => 3,

// for details of possible values see crypto_password_version_constants
// in the file js/crypter/crypto_app.js
Expand Down