◐ Shell
reader mode source ↗
Skip to content

bpo-31702: Allow to specify rounds for SHA-2 hashing in crypt.mksalt().#4110

Merged
serhiy-storchaka merged 6 commits into
python:masterfrom
serhiy-storchaka:crypt-sha2-rounds
Nov 16, 2017
Merged

bpo-31702: Allow to specify rounds for SHA-2 hashing in crypt.mksalt().#4110
serhiy-storchaka merged 6 commits into
python:masterfrom
serhiy-storchaka:crypt-sha2-rounds

Conversation

@serhiy-storchaka

@serhiy-storchaka serhiy-storchaka commented Oct 24, 2017 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

The log_rounds parameter for Blowfish is replaced with the rounds parameter.

https://bugs.python.org/issue31702

@serhiy-storchaka
bpo-31702: Allow to specify rounds for SHA-2 hashing in crypt.mksalt(). …
4ebdd2a 
The log_rounds parameter for Blowfish is replaced with the rounds parameter.
@serhiy-storchaka serhiy-storchaka added the type-feature A feature request or enhancement label Oct 24, 2017
vstinner
vstinner requested changes Oct 26, 2017
View reviewed changes

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hide comment

I'm not sure between "1 << log_rounds" and "2 ** log_round", I have no preference. It's up to you ;-)

@bedevere-bot

bedevere-bot commented Oct 26, 2017

Copy link
Copy Markdown

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@serhiy-storchaka

serhiy-storchaka commented Oct 31, 2017

Copy link
Copy Markdown
Member Author

I have made the requested changes; please review again.

@bedevere-bot

bedevere-bot commented Oct 31, 2017

Copy link
Copy Markdown

Thanks for making the requested changes!

@Haypo: please review the changes made to this pull request.

taleinat
taleinat reviewed Oct 31, 2017
View reviewed changes

@taleinat taleinat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hide comment

LGTM

@bedevere-bot

bedevere-bot commented Oct 31, 2017

Copy link
Copy Markdown

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

And if you don't make the requested changes, you will be poked with soft cushions!

@serhiy-storchaka

serhiy-storchaka commented Nov 16, 2017

Copy link
Copy Markdown
Member Author

I have made the requested changes; please review again.

@bedevere-bot

bedevere-bot commented Nov 16, 2017

Copy link
Copy Markdown

Thanks for making the requested changes!

@Haypo: please review the changes made to this pull request.

vstinner
vstinner approved these changes Nov 16, 2017
View reviewed changes

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hide comment

LGTM!

@vstinner

vstinner commented Nov 16, 2017

Copy link
Copy Markdown
Member

Thanks, I prefer the new code to handle invalid values and the new tests.

@serhiy-storchaka serhiy-storchaka merged commit cede8c9 into python:master Nov 16, 2017
@serhiy-storchaka serhiy-storchaka deleted the crypt-sha2-rounds branch November 16, 2017 11:22
jimmylai added a commit to jimmylai/cpython that referenced this pull request Nov 17, 2017
@jimmylai
Merge branch 'master' of https://github.com/python/cpython …
d914928 
* 'master' of https://github.com/python/cpython: (550 commits)
  bpo-31867: Remove duplicates in default mimetypes. (python#4388)
  tokenizer: Remove unused tabs options (python#4422)
  bpo-31691: Specify where to find build instructions for the Windows installer (python#4426)
  Fix typo in atexit documentation. (pythonGH-4419)
  bpo-31702: Allow to specify rounds for SHA-2 hashing in crypt.mksalt(). (python#4110)
  bpo-32043: New "developer mode": "-X dev" option (python#4413)
  bpo-30349: Raise FutureWarning for nested sets and set operations (python#1553)
  bpo-32037: Use the INT opcode for 32-bit integers in protocol 0 pickles. (python#4407)
  bpo-30143: 2to3 now generates a code that uses abstract collection classes (python#1262)
  bpo-32030: Enhance Py_Main() (python#4412)
  bpo-32030: Split Py_Main() into subfunctions (python#4399)
  bpo-32034: Make IncompleteReadError & LimitOverrunError pickleable python#4409
  bpo-32025: Add time.thread_time() (python#4410)
  bpo-32018: Fix inspect.signature repr to follow PEP 8 (python#4408)
  bpo-30399: Get rid of trailing comma in the repr of BaseException. (python#1650)
  bpo-30950: Convert round() to Argument Clinic. (python#2740)
  bpo-32011: Revert "Issue python#15480: Remove the deprecated and unused TYPE_INT64 code from marshal." (python#4381)
  bpo-32023: Disallow genexprs without parenthesis in class definitions. (python#4400)
  bpo-31949: Fixed several issues in printing tracebacks (PyTraceBack_Print()). (python#4289)
  bpo-32032: Test both implementations of module-level pickle API. (python#4401)
  ...
@JelleZijlstra JelleZijlstra mentioned this pull request Mar 18, 2018
Closed
41 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@taleinat taleinat taleinat left review comments

@vstinner vstinner vstinner approved these changes

Assignees

No one assigned

Labels

type-feature A feature request or enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@serhiy-storchaka @bedevere-bot @vstinner @taleinat @the-knights-who-say-ni