diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-01 21:00:32 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-01 21:23:01 +0200 |
| commit | 2e731f24b5a5c894e013a6d752f1cd409303e916 (patch) | |
| tree | 94ba6f1e3ab9ecb5ac1696b48b1aabc859aa8365 /src/crypter.h | |
| parent | f6a81050372810d8eebc15523bde28e91d045314 (diff) | |
| parent | 31e9a8384a77947f6777d035992f4734618ed206 (diff) | |
| download | bitcoin-2e731f24b5a5c894e013a6d752f1cd409303e916.tar.xz | |
Merge pull request #4737
31e9a83 Use CSizeComputer to avoid counting sizes in SerializationOp (Pieter Wuille)
84881f8 rework overhauled serialization methods to non-static (Kamil Domanski)
5d96b4a remove fields of ser_streamplaceholder (Kamil Domanski)
3d796f8 overhaul serialization code (Kamil Domanski)
Diffstat (limited to 'src/crypter.h')
| -rw-r--r-- | src/crypter.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/crypter.h b/src/crypter.h index 9b592dbcdc..59efc76508 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -43,14 +43,17 @@ public: // such as the various parameters to scrypt std::vector<unsigned char> vchOtherDerivationParameters; - IMPLEMENT_SERIALIZE - ( + IMPLEMENT_SERIALIZE; + + template <typename Stream, typename Operation> + inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) { READWRITE(vchCryptedKey); READWRITE(vchSalt); READWRITE(nDerivationMethod); READWRITE(nDeriveIterations); READWRITE(vchOtherDerivationParameters); - ) + } + CMasterKey() { // 25000 rounds is just under 0.1 seconds on a 1.86 GHz Pentium M |