Skip to content

fix(auth): Changing variable from "MemoryCost" to "cpuMemCost" in standard_scrypt method #643

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

Merged
merged 3 commits into from
Sep 14, 2022
Merged

fix(auth): Changing variable from "MemoryCost" to "cpuMemCost" in standard_scrypt method #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4b4dd3
Changing 'memoryCost' to CpuMemCost
pragatimodi Sep 8, 2022
b860a58
Update Test for standard_scrypt
pragatimodi Sep 8, 2022
dca0da9
Update _user_import.py
pragatimodi Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions firebase_admin/_user_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ def standard_scrypt(cls, memory_cost, parallelization, block_size, derived_key_l
"""Creates a new standard Scrypt algorithm instance.

Args:
memory_cost: Memory cost as a non-negaive integer.
memory_cost: CPU Memory cost as a non-negative integer.
parallelization: Parallelization as a non-negative integer.
block_size: Block size as a non-negative integer.
derived_key_length: Derived key length as a non-negative integer.
Expand All @@ -463,7 +463,7 @@ def standard_scrypt(cls, memory_cost, parallelization, block_size, derived_key_l
UserImportHash: A new ``UserImportHash``.
"""
data = {
'memoryCost': _auth_utils.validate_int(memory_cost, 'memory_cost', low=0),
'cpuMemCost': _auth_utils.validate_int(memory_cost, 'memory_cost', low=0),
'parallelization': _auth_utils.validate_int(parallelization, 'parallelization', low=0),
'blockSize': _auth_utils.validate_int(block_size, 'block_size', low=0),
'dkLen': _auth_utils.validate_int(derived_key_length, 'derived_key_length', low=0),
Expand Down
2 changes: 1 addition & 1 deletion tests/test_user_mgt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ def test_standard_scrypt(self):
memory_cost=14, parallelization=2, block_size=10, derived_key_length=128)
expected = {
'hashAlgorithm': 'STANDARD_SCRYPT',
'memoryCost': 14,
'cpuMemCost': 14,
'parallelization': 2,
'blockSize': 10,
'dkLen': 128,
Expand Down