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

[stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2 #38584

Merged
merged 2 commits into from Jun 20, 2023

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Jun 1, 2023

Backport of #38206

  • incomplete

Checklist

@come-nc come-nc added the 2. developing Work in progress label Jun 1, 2023
@come-nc come-nc self-assigned this Jun 1, 2023
@come-nc
Copy link
Contributor Author

come-nc commented Jun 1, 2023

/backport to stable23

@come-nc
Copy link
Contributor Author

come-nc commented Jun 1, 2023

/backport to stable22

@come-nc
Copy link
Contributor Author

come-nc commented Jun 1, 2023

/backport to stable21

@come-nc
Copy link
Contributor Author

come-nc commented Jun 1, 2023

/backport to stable20

@come-nc come-nc changed the title Increase from 100000 to 600000 iterations for hash_pbkdf2 [stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2 Jun 20, 2023
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc merged commit a7dc41f into stable24 Jun 20, 2023
26 of 28 checks passed
@come-nc come-nc deleted the backport/38206/stable24 branch June 20, 2023 15:46
@backportbot-nextcloud
Copy link

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

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

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

# 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-stable21

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 stable20 failed. Please do this backport manually.

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

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

# 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-stable20

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

@come-nc
Copy link
Contributor Author

come-nc commented Jun 22, 2023

/backport to stable23

@backportbot-nextcloud
Copy link

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

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

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

# 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-stable23

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

@come-nc
Copy link
Contributor Author

come-nc commented Jun 22, 2023

/backport to stable21

@backportbot-nextcloud
Copy link

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

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

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

# 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-stable21

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

come-nc added a commit that referenced this pull request Jun 27, 2023
[stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2

(cherry picked from commit a7dc41f)
backportbot-nextcloud bot pushed a commit that referenced this pull request Jul 17, 2023
[stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2

(cherry picked from commit a7dc41f)
backportbot-nextcloud bot pushed a commit that referenced this pull request Jul 17, 2023
[stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2

(cherry picked from commit a7dc41f)
come-nc added a commit that referenced this pull request Jul 18, 2023
[stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2

(cherry picked from commit a7dc41f)
(cherry picked from commit 18de4a2)
backportbot-nextcloud bot pushed a commit that referenced this pull request Jul 31, 2023
[stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2

(cherry picked from commit a7dc41f)
(cherry picked from commit 18de4a2)
@come-nc come-nc added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress backport-request labels Dec 4, 2023
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants