1
0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00

Updating PuTTY 0.85 fixes to bcc32

Source commit: 0fe575bc262df9e28a86ab8e0ba39163410e56b6
This commit is contained in:
Martin Prikryl
2026-08-25 14:05:23 +00:00
parent fec8b0d00d
commit afbcdcd14b
2 changed files with 3 additions and 1 deletions

View File

@@ -923,12 +923,14 @@ ssh2_userkey *ppk_load_s(BinarySource *src, const char *passphrase,
sfree(b);
/* Check the Argon2 parameters make sense */
{ // WINSCP
uint32_t taglen = ciphertype->keylen + ciphertype->ivlen + 32;
if (!argon2_params_valid(
params.argon2_mem, params.argon2_passes,
params.argon2_parallelism, taglen,
passphrase_pl.len, passphrase_salt->len, 0, 0))
goto error;
} // WINSCP
}
/* Read the Private-Lines header line and the Private blob. */

View File

@@ -524,7 +524,7 @@ BEGIN
CORE_VARIABLE_STRINGS, "CORE_VARIABLE"
PUTTY_BASED_ON, "SSH and SCP code based on PuTTY %s"
PUTTY_COPYRIGHT, "Copyright © 1997–2025 Simon Tatham"
PUTTY_COPYRIGHT, "Copyright © 1997–2026 Simon Tatham"
PUTTY_URL, "https://www.chiark.greenend.org.uk/~sgtatham/putty/"
FILEZILLA_BASED_ON2, "FTP code based on FileZilla"
FILEZILLA_COPYRIGHT2, "Copyright © Tim Kosse"