aboutsummaryrefslogtreecommitdiffstats
path: root/src/passhash
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-18 20:44:34 +0000
committerlloyd <[email protected]>2012-05-18 20:44:34 +0000
commit8383b0b503c812e45f2780217b048a19a8946853 (patch)
tree939403bad80ee2b1e13b69c82adc316422a9c7d6 /src/passhash
parentc691561f3198f481c13457433efbccc1c9fcd898 (diff)
Replace 0 and NULL pointer constants with nullptr. Also fix an old
style cast in secmem.h
Diffstat (limited to 'src/passhash')
-rw-r--r--src/passhash/passhash9/passhash9.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/passhash/passhash9/passhash9.cpp b/src/passhash/passhash9/passhash9.cpp
index cbfe668f1..af7ed761b 100644
--- a/src/passhash/passhash9/passhash9.cpp
+++ b/src/passhash/passhash9/passhash9.cpp
@@ -40,7 +40,7 @@ MessageAuthenticationCode* get_pbkdf_prf(byte alg_id)
}
catch(Algorithm_Not_Found) {}
- return 0;
+ return nullptr;
}
}
@@ -120,7 +120,7 @@ bool check_passhash9(const std::string& pass, const std::string& hash)
MessageAuthenticationCode* pbkdf_prf = get_pbkdf_prf(alg_id);
- if(pbkdf_prf == 0)
+ if(!pbkdf_prf)
return false; // unknown algorithm, reject
PKCS5_PBKDF2 kdf(pbkdf_prf); // takes ownership of pointer