aboutsummaryrefslogtreecommitdiffstats
path: root/src/pbe/pbes2/pbes2.cpp
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/pbe/pbes2/pbes2.cpp
parentc691561f3198f481c13457433efbccc1c9fcd898 (diff)
Replace 0 and NULL pointer constants with nullptr. Also fix an old
style cast in secmem.h
Diffstat (limited to 'src/pbe/pbes2/pbes2.cpp')
-rw-r--r--src/pbe/pbes2/pbes2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pbe/pbes2/pbes2.cpp b/src/pbe/pbes2/pbes2.cpp
index 384fc3d90..752a4fb6d 100644
--- a/src/pbe/pbes2/pbes2.cpp
+++ b/src/pbe/pbes2/pbes2.cpp
@@ -228,8 +228,8 @@ PBE_PKCS5v20::PBE_PKCS5v20(BlockCipher* cipher,
*/
PBE_PKCS5v20::PBE_PKCS5v20(DataSource& params) : direction(DECRYPTION)
{
- hash_function = 0;
- block_cipher = 0;
+ hash_function = nullptr;
+ block_cipher = nullptr;
decode_params(params);
}