nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

PuTTYgen: explicitly use 'Kbyte' in Argon2 naming.

Browse Source 
Instead of 'Kb', which could be misread as 'Kbit'.
This commit is contained in:
Jacob Nevins 2021-04-19 17:03:05 +01:00
parent 20d5055a3a
commit 97137f5cfd
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdgen.c
View File

@ -157,7 +157,7 @@ void help(void)
"default 3)\n" "default 3)\n"
" kdf key derivation function (argon2id, " " kdf key derivation function (argon2id, "
"argon2i, argon2d)\n" "argon2i, argon2d)\n"
" memory Kb of memory to use in password hash " " memory Kbyte of memory to use in password hash "
"(default 8192)\n" "(default 8192)\n"
" time approx milliseconds to hash for " " time approx milliseconds to hash for "
"(default 100)\n" "(default 100)\n"

2
doc/pubkeyfmt.but
View File

@ -124,7 +124,7 @@ passphrase:
password-hashing function. password-hashing function.
The three integer values are used as parameters for Argon2, which The three integer values are used as parameters for Argon2, which
allows you to configure the amount of memory used (in Kb), the number allows you to configure the amount of memory used (in Kbyte), the number
of passes of the algorithm to run (to tune its running time), and the of passes of the algorithm to run (to tune its running time), and the
degree of parallelism required by the hash function. The salt is degree of parallelism required by the hash function. The salt is
decoded into a sequence of binary bytes and used as an additional decoded into a sequence of binary bytes and used as an additional

2
ssh.h
View File

@ -1242,7 +1242,7 @@ typedef struct ppk_save_parameters {
* Parameters for fmt_version == 3 * Parameters for fmt_version == 3
*/ */
Argon2Flavour argon2_flavour; Argon2Flavour argon2_flavour;
uint32_t argon2_mem; /* in Kb */ uint32_t argon2_mem; /* in Kbyte */
bool argon2_passes_auto; bool argon2_passes_auto;
union { union {
uint32_t argon2_passes; /* if auto == false */ uint32_t argon2_passes; /* if auto == false */

2
test/cryptsuite.py
View File

@ -1932,7 +1932,7 @@ culpa qui officia deserunt mollit anim id est laborum.
secret = b"secret" secret = b"secret"
assoc = b"associated data" assoc = b"associated data"
# Smallest memory (8Kb) and parallelism (1) parameters the # Smallest memory (8Kbyte) and parallelism (1) parameters the
# reference implementation will accept, but lots of passes # reference implementation will accept, but lots of passes
self.assertEqualBin( self.assertEqualBin(
argon2('i', 8, 16, 1, 24, pwd, salt, secret, assoc), unhex( argon2('i', 8, 16, 1, 24, pwd, salt, secret, assoc), unhex(

2
windows/puttygen.rc
View File

@ -69,7 +69,7 @@ BEGIN
LTEXT "Memory to use for password hash:", IDC_ARGON2_MEM_STATIC, LTEXT "Memory to use for password hash:", IDC_ARGON2_MEM_STATIC,
5, 36, 115, 8 5, 36, 115, 8
EDITTEXT IDC_ARGON2_MEM, 120, 34, 40, 12 EDITTEXT IDC_ARGON2_MEM, 120, 34, 40, 12
LTEXT "Kb", IDC_ARGON2_MEM_STATIC2, 170, 36, 34, 8 LTEXT "Kbyte", IDC_ARGON2_MEM_STATIC2, 170, 36, 34, 8
LTEXT "Time to use for password hash:", IDC_ARGON2_TIME_STATIC, LTEXT "Time to use for password hash:", IDC_ARGON2_TIME_STATIC,
5, 50, 115, 8 5, 50, 115, 8
EDITTEXT IDC_ARGON2_TIME, 120, 48, 40, 12 EDITTEXT IDC_ARGON2_TIME, 120, 48, 40, 12