Skip to content

[stable26] Increase from 100000 to 600000 iterations for hash_pbkdf2 #38583

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jun 12, 2023
Merged

[stable26] Increase from 100000 to 600000 iterations for hash_pbkdf2 #38583

merged 2 commits into from
Jun 12, 2023

Conversation

@come-nc
Copy link
Contributor

@come-nc come-nc commented Jun 1, 2023 •
edited
Loading

Backport of #38206

Checklist

come-nc added 2 commits June 1, 2023 17:59
@come-nc
Increase from 100000 to 600000 iterations for hash_pbkdf2
212b98d 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Adapt encryption test to change in generateHeader
291bd93 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc added the 3. to review Waiting for reviews label Jun 1, 2023
@come-nc come-nc self-assigned this Jun 1, 2023
@come-nc come-nc requested review from a team, ArtificialOwl, blizzz and icewind1991 and removed request for a team June 1, 2023 16:02
@AndyScherzinger AndyScherzinger added this to the Nextcloud 26.0.3 milestone Jun 1, 2023
@blizzz blizzz mentioned this pull request Jun 12, 2023
Merged
@come-nc come-nc changed the title Backport/38206/stable26 [stable26] Increase from 100000 to 600000 iterations for hash_pbkdf2 Jun 12, 2023
szaimen
szaimen approved these changes Jun 12, 2023
View reviewed changes
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@szaimen szaimen enabled auto-merge June 12, 2023 14:46
@szaimen szaimen disabled auto-merge June 12, 2023 14:46
@szaimen szaimen merged commit 9071864 into stable26 Jun 12, 2023
@szaimen szaimen deleted the backport/38206/stable26 branch June 12, 2023 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@icewind1991 icewind1991 icewind1991 approved these changes

@szaimen szaimen szaimen approved these changes

@ArtificialOwl ArtificialOwl Awaiting requested review from ArtificialOwl ArtificialOwl was automatically assigned from nextcloud/server-backend

@blizzz blizzz Awaiting requested review from blizzz blizzz was automatically assigned from nextcloud/server-backend

Assignees

@come-nc come-nc

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

Nextcloud 26.0.3

Development

Successfully merging this pull request may close these issues.

5 participants

@come-nc @icewind1991 @szaimen @AndyScherzinger