aboutsummaryrefslogtreecommitdiffstats
path: root/src/stream/salsa20/salsa20.h
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-25 02:11:10 +0000
committerlloyd <[email protected]>2012-05-25 02:11:10 +0000
commit113f4035f41cf3152832e1753d28b79a7ea811a4 (patch)
tree1e2071c1f7786972d268b727f52ee33225ad68d4 /src/stream/salsa20/salsa20.h
parentee42784fee56c48f72ecf03d7b93765dac35edf5 (diff)
For block and stream ciphers, don't set the size of the key vectors
until we are actually setting a key. This avoids the problem of prototype objects consuming not just memory but the precious few bytes of mlock'able memory that we're given by Linux. Use clear_mem instead of a loop in BigInt::mask_bits If OS2ECP encounters an invalid format type, include what type it was in the exception message.
Diffstat (limited to 'src/stream/salsa20/salsa20.h')
-rw-r--r--src/stream/salsa20/salsa20.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/stream/salsa20/salsa20.h b/src/stream/salsa20/salsa20.h
index ac2a9b33a..b68bb979e 100644
--- a/src/stream/salsa20/salsa20.h
+++ b/src/stream/salsa20/salsa20.h
@@ -33,8 +33,6 @@ class BOTAN_DLL Salsa20 : public StreamCipher
void clear();
std::string name() const;
StreamCipher* clone() const { return new Salsa20; }
-
- Salsa20() : state(16), buffer(64), position(0) {}
private:
void key_schedule(const byte key[], size_t key_len);