aboutsummaryrefslogtreecommitdiffstats
path: root/src/s2k
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-11-17 16:25:51 +0000
committerlloyd <[email protected]>2009-11-17 16:25:51 +0000
commit49b20f4e4ff3b8e3141905871ccae9fc70e77a1d (patch)
treec00201a612018adb51278ad095721d45ab3766af /src/s2k
parent57199e2a8ec339c9cccb5c837416f91119936213 (diff)
Use the new support for explicitly deleting functions instead of hiding
them as private variables for operator= and copy constructors that shouldn't be used.
Diffstat (limited to 'src/s2k')
-rw-r--r--src/s2k/s2k.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/s2k/s2k.h b/src/s2k/s2k.h
index 7af92519b..ca86ab77a 100644
--- a/src/s2k/s2k.h
+++ b/src/s2k/s2k.h
@@ -87,12 +87,13 @@ class BOTAN_DLL S2K
S2K() { iter = 0; }
virtual ~S2K() {}
- private:
- S2K(const S2K&) {}
- S2K& operator=(const S2K&) { return (*this); }
+ S2K(const S2K&) = delete;
+ S2K& operator=(const S2K&) = delete;
+ private:
virtual OctetString derive(u32bit, const std::string&,
const byte[], u32bit, u32bit) const = 0;
+
SecureVector<byte> salt;
u32bit iter;
};