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

Increase from 100000 to 600000 iterations for hash_pbkdf2 #38206

Merged
merged 2 commits into from May 25, 2023

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented May 11, 2023

Summary

Checklist

@come-nc come-nc added enhancement 3. to review Waiting for reviews labels May 11, 2023
@come-nc come-nc self-assigned this May 11, 2023
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

Sure

@come-nc
Copy link
Contributor Author

come-nc commented May 15, 2023

/rebase

@nextcloud-command nextcloud-command force-pushed the fix/increase-iterations-for-pbkdf2 branch from f755caf to eb04508 Compare May 15, 2023 08:33
@come-nc come-nc added this to the Nextcloud 27 milestone May 15, 2023
@szaimen
Copy link
Contributor

szaimen commented May 16, 2023

Can someone restart drone?

@szaimen szaimen enabled auto-merge May 16, 2023 09:33
@blizzz blizzz mentioned this pull request May 17, 2023
@blizzz blizzz modified the milestones: Nextcloud 27, Nextcloud 28 May 23, 2023
@szaimen
Copy link
Contributor

szaimen commented May 23, 2023

/rebase

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@nextcloud-command nextcloud-command force-pushed the fix/increase-iterations-for-pbkdf2 branch from eb04508 to 2a6f347 Compare May 23, 2023 20:53
@szaimen
Copy link
Contributor

szaimen commented May 24, 2023

Screenshot_20230524_095429_Brave

@szaimen szaimen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels May 24, 2023
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@szaimen szaimen merged commit 0ad56e5 into master May 25, 2023
37 checks passed
@szaimen szaimen deleted the fix/increase-iterations-for-pbkdf2 branch May 25, 2023 18:18
@come-nc
Copy link
Contributor Author

come-nc commented May 30, 2023

/backport to stable27

@come-nc
Copy link
Contributor Author

come-nc commented May 30, 2023

/backport to stable26

@come-nc
Copy link
Contributor Author

come-nc commented May 30, 2023

/backport to stable25

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin/stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants