From 1ee3a8df868377ecf5b176c3c268d58f1461590d Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <mail@smessmer.de>
Date: Wed, 9 Mar 2016 00:20:04 +0100
Subject: [PATCH] Use uint64_t for block size

---
 src/cryfs/config/CryConfig.cpp | 8 ++++----
 src/cryfs/config/CryConfig.h   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cryfs/config/CryConfig.cpp b/src/cryfs/config/CryConfig.cpp
index 45bec926..38e87e84 100644
--- a/src/cryfs/config/CryConfig.cpp
+++ b/src/cryfs/config/CryConfig.cpp
@@ -33,7 +33,7 @@ CryConfig CryConfig::load(const Data &data) {
   cfg._encKey = pt.get("cryfs.key", "");
   cfg._cipher = pt.get("cryfs.cipher", "");
   cfg._version = pt.get("cryfs.version", "0.8"); // CryFS 0.8 didn't specify this field, so if the field doesn't exist, it's 0.8.
-  cfg._blocksizeBytes = pt.get<uint32_t>("cryfs.blocksizeBytes", 32 * 1024); // TODO Put here the actual block size value of earlier CryFS versions
+  cfg._blocksizeBytes = pt.get<uint64_t>("cryfs.blocksizeBytes", 32 * 1024); // CryFS <= 0.9.1 used a 32KB block size.
   return cfg;
 }
 
@@ -44,7 +44,7 @@ Data CryConfig::save() const {
   pt.put("cryfs.key", _encKey);
   pt.put("cryfs.cipher", _cipher);
   pt.put("cryfs.version", _version);
-  pt.put<uint32_t>("cryfs.blocksizeBytes", _blocksizeBytes);
+  pt.put<uint64_t>("cryfs.blocksizeBytes", _blocksizeBytes);
 
   stringstream stream;
   write_json(stream, pt);
@@ -83,11 +83,11 @@ void CryConfig::SetVersion(const std::string &value) {
   _version = value;
 }
 
-uint32_t CryConfig::BlocksizeBytes() const {
+uint64_t CryConfig::BlocksizeBytes() const {
   return _blocksizeBytes;
 }
 
-void CryConfig::SetBlocksizeBytes(uint32_t value) {
+void CryConfig::SetBlocksizeBytes(uint64_t value) {
   _blocksizeBytes = value;
 }
 
diff --git a/src/cryfs/config/CryConfig.h b/src/cryfs/config/CryConfig.h
index c3a01f92..b970d38d 100644
--- a/src/cryfs/config/CryConfig.h
+++ b/src/cryfs/config/CryConfig.h
@@ -27,8 +27,8 @@ public:
   const std::string &Version() const;
   void SetVersion(const std::string &value);
 
-  uint32_t BlocksizeBytes() const;
-  void SetBlocksizeBytes(uint32_t value);
+  uint64_t BlocksizeBytes() const;
+  void SetBlocksizeBytes(uint64_t value);
 
   static CryConfig load(const cpputils::Data &data);
   cpputils::Data save() const;
@@ -38,7 +38,7 @@ private:
   std::string _encKey;
   std::string _cipher;
   std::string _version;
-  uint32_t _blocksizeBytes;
+  uint64_t _blocksizeBytes;
 
   DISALLOW_COPY_AND_ASSIGN(CryConfig);
 };