diff options
| author | B. Stack <bgstack15@gmail.com> | 2023-02-21 12:13:36 -0500 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2023-02-21 12:13:36 -0500 |
| commit | 5a6ed4e8eadf3af3d141b246f124d67b62a1357c (patch) | |
| tree | 4e49ae80efbe181c46110867fe7cf703efd3fcf5 /zen/argon2.cpp | |
| parent | argon2 copyright notice updated (diff) | |
| download | FreeFileSync-5a6ed4e8eadf3af3d141b246f124d67b62a1357c.tar.gz FreeFileSync-5a6ed4e8eadf3af3d141b246f124d67b62a1357c.tar.bz2 FreeFileSync-5a6ed4e8eadf3af3d141b246f124d67b62a1357c.zip | |
add upstream 12.112.1
Diffstat (limited to 'zen/argon2.cpp')
| -rw-r--r-- | zen/argon2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zen/argon2.cpp b/zen/argon2.cpp index d78dc26c..f48abe5e 100644 --- a/zen/argon2.cpp +++ b/zen/argon2.cpp @@ -4,9 +4,9 @@ // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** -/* The code in this file, except for zen::zargon2() is from: +/* The code in this file, except for zen::zargon2(), is from PuTTY: - PuTTY is copyright 1997-2022 Simon Tatham. + PuTTY is copyright 1997-2022 Simon Tatham. Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, @@ -972,7 +972,7 @@ std::string zen::zargon2(zen::Argon2Flavor flavour, uint32_t mem, uint32_t passe std::string output(taglen, '\0'); argon2_internal(parallel, taglen, mem, passes, static_cast<uint32_t>(flavour), {.ptr = password.data(), .len = password.size()}, - {.ptr = salt.data(), .len = salt.size()}, + {.ptr = salt .data(), .len = salt .size()}, {.ptr = "", .len = 0}, {.ptr = "", .len = 0}, reinterpret_cast<uint8_t*>(output.data())); return output; |