diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-06-30 14:01:02 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-06-30 14:01:02 +0100 |
| commit | d8b24acb779db5314cc6c1f2e35da27b7b655c29 (patch) | |
| tree | b4a15ec31a96e7377047075233b6024c7cc1cd18 /src/session.cpp | |
| parent | 8dd3c182ee568b9121a336b106aaaceedd1cc470 (diff) | |
PR feedback
* write V1 pickles on the master branch
* the logging branch is going to write v0x80000001
Diffstat (limited to 'src/session.cpp')
| -rw-r--r-- | src/session.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/session.cpp b/src/session.cpp index b76a6b8..6ca7f36 100644 --- a/src/session.cpp +++ b/src/session.cpp @@ -396,7 +396,9 @@ std::size_t olm::Session::decrypt( } namespace { -static const std::uint32_t SESSION_PICKLE_VERSION = 2; +// the master branch writes pickle version 1; the logging_enabled branch writes +// 0x80000001. +static const std::uint32_t SESSION_PICKLE_VERSION = 1; } std::size_t olm::pickle_length( @@ -440,7 +442,7 @@ std::uint8_t const * olm::unpickle( includes_chain_index = false; break; - case 2: + case 0x80000001UL: includes_chain_index = true; break; |