diff options
| author | Jack Lloyd <[email protected]> | 2018-09-10 19:19:19 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-10-01 12:53:53 -0400 |
| commit | 8eb900731da945d276f723534af09592213ee582 (patch) | |
| tree | d080c6fd2ca760796b522d21288b0b4bfc0b6e65 /src/lib/ffi/ffi_kdf.cpp | |
| parent | a792728e8941b62761052f5e0d288ba13a016c77 (diff) | |
Remove support for Visual C++ 2013
Closes GH #1557
Diffstat (limited to 'src/lib/ffi/ffi_kdf.cpp')
| -rw-r--r-- | src/lib/ffi/ffi_kdf.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ffi/ffi_kdf.cpp b/src/lib/ffi/ffi_kdf.cpp index c55515a42..d38dd594b 100644 --- a/src/lib/ffi/ffi_kdf.cpp +++ b/src/lib/ffi/ffi_kdf.cpp @@ -67,7 +67,7 @@ int botan_pwdhash( if(password_len == 0) password_len = std::strlen(password); - return ffi_guard_thunk(BOTAN_CURRENT_FUNCTION, [=]() -> int { + return ffi_guard_thunk(__func__, [=]() -> int { auto pwdhash_fam = Botan::PasswordHashFamily::create(algo); if(!pwdhash_fam) @@ -102,7 +102,7 @@ int botan_pwdhash_timed( if(password_len == 0) password_len = std::strlen(password); - return ffi_guard_thunk(BOTAN_CURRENT_FUNCTION, [=]() -> int { + return ffi_guard_thunk(__func__, [=]() -> int { auto pwdhash_fam = Botan::PasswordHashFamily::create(algo); @@ -132,7 +132,7 @@ int botan_kdf(const char* kdf_algo, const uint8_t salt[], size_t salt_len, const uint8_t label[], size_t label_len) { - return ffi_guard_thunk(BOTAN_CURRENT_FUNCTION, [=]() -> int { + return ffi_guard_thunk(__func__, [=]() -> int { std::unique_ptr<Botan::KDF> kdf(Botan::get_kdf(kdf_algo)); kdf->kdf(out, out_len, secret, secret_len, salt, salt_len, label, label_len); return BOTAN_FFI_SUCCESS; @@ -156,7 +156,7 @@ int botan_bcrypt_generate(uint8_t* out, size_t* out_len, uint32_t flags) { #if defined(BOTAN_HAS_BCRYPT) - return ffi_guard_thunk(BOTAN_CURRENT_FUNCTION, [=]() -> int { + return ffi_guard_thunk(__func__, [=]() -> int { if(out == nullptr || out_len == nullptr || pass == nullptr) return BOTAN_FFI_ERROR_NULL_POINTER; @@ -178,7 +178,7 @@ int botan_bcrypt_generate(uint8_t* out, size_t* out_len, int botan_bcrypt_is_valid(const char* pass, const char* hash) { #if defined(BOTAN_HAS_BCRYPT) - return ffi_guard_thunk(BOTAN_CURRENT_FUNCTION, [=]() -> int { + return ffi_guard_thunk(__func__, [=]() -> int { return Botan::check_bcrypt(pass, hash) ? BOTAN_FFI_SUCCESS : BOTAN_FFI_INVALID_VERIFIER; }); #else |