aboutsummaryrefslogtreecommitdiffstats
path: root/src/stream
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/stream
parentc691561f3198f481c13457433efbccc1c9fcd898 (diff)
Replace 0 and NULL pointer constants with nullptr. Also fix an old
style cast in secmem.h
Diffstat (limited to 'src/stream')
-rw-r--r--src/stream/ctr/ctr.cpp2
-rw-r--r--src/stream/ofb/ofb.cpp2
-rw-r--r--src/stream/turing/turing.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/stream/ctr/ctr.cpp b/src/stream/ctr/ctr.cpp
index 8ceac858a..87ec86c65 100644
--- a/src/stream/ctr/ctr.cpp
+++ b/src/stream/ctr/ctr.cpp
@@ -49,7 +49,7 @@ void CTR_BE::key_schedule(const byte key[], size_t key_len)
permutation->set_key(key, key_len);
// Set a default all-zeros IV
- set_iv(0, 0);
+ set_iv(nullptr, 0);
}
/*
diff --git a/src/stream/ofb/ofb.cpp b/src/stream/ofb/ofb.cpp
index 02521581b..1137a58af 100644
--- a/src/stream/ofb/ofb.cpp
+++ b/src/stream/ofb/ofb.cpp
@@ -46,7 +46,7 @@ void OFB::key_schedule(const byte key[], size_t key_len)
permutation->set_key(key, key_len);
// Set a default all-zeros IV
- set_iv(0, 0);
+ set_iv(nullptr, 0);
}
/*
diff --git a/src/stream/turing/turing.cpp b/src/stream/turing/turing.cpp
index c455185b0..10ac18315 100644
--- a/src/stream/turing/turing.cpp
+++ b/src/stream/turing/turing.cpp
@@ -273,7 +273,7 @@ void Turing::key_schedule(const byte key[], size_t length)
S3[i] = (W3 & 0xFFFFFF00) | C3;
}
- set_iv(0, 0);
+ set_iv(nullptr, 0);
}
/*