use some placeholder data for agile key

tfussell · Apr 20, 2017 · 4dedcd2 · 4dedcd2
1 parent b26d764
commit 4dedcd2
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/source/detail/cryptography/pole.cpp b/source/detail/cryptography/pole.cpp
@@ -632,9 +632,9 @@ void DirTree::debug()
 
 // =========== StorageIO ==========
 
-StorageIO::StorageIO(Storage *st, char *bytes, std::size_t length)
+StorageIO::StorageIO(Storage *st, std::uint8_t *bytes, std::size_t length)
     : storage(st),
-      filedata(reinterpret_cast<std::uint8_t *>(bytes)),
+      filedata(bytes),
       dataLength(length),
       result(Storage::Ok),
       opened(false),
@@ -1064,7 +1064,7 @@ void StreamIO::updateCache()
 
 // =========== Storage ==========
 
-Storage::Storage(char *bytes, std::size_t length)
+Storage::Storage(std::uint8_t *bytes, std::size_t length)
     : io(new StorageIO(this, bytes, length))
 {
 }

diff --git a/source/detail/cryptography/pole.hpp b/source/detail/cryptography/pole.hpp
@@ -56,7 +56,7 @@ namespace POLE
         /**
          * Constructs a storage with name filename.
          **/
-        Storage( char* bytes, std::size_t length );
+        Storage(std::uint8_t *bytes, std::size_t length);
 
         /**
          * Destroys the storage.
@@ -279,7 +279,7 @@ namespace POLE
 
         std::list<Stream*> streams;
 
-        StorageIO( Storage* storage, char* bytes, std::size_t length );
+        StorageIO( Storage* storage, std::uint8_t *bytes, std::size_t length );
         ~StorageIO();
 
         bool open();

diff --git a/source/detail/cryptography/xlsx_crypto_consumer.cpp b/source/detail/cryptography/xlsx_crypto_consumer.cpp
@@ -386,8 +386,7 @@ std::vector<std::uint8_t> decrypt_xlsx(
         throw xlnt::exception("empty file");
     }
 
-    std::vector<char> as_chars(bytes.begin(), bytes.end());
-    POLE::Storage storage(as_chars.data(), static_cast<unsigned long>(bytes.size()));
+    POLE::Storage storage(const_cast<std::uint8_t *>(bytes.data()), bytes.size());
 
     if (!storage.open())
     {

diff --git a/source/detail/cryptography/xlsx_crypto_producer.cpp b/source/detail/cryptography/xlsx_crypto_producer.cpp
@@ -39,6 +39,35 @@ encryption_info generate_encryption_info(const std::u16string &password)
 {
     encryption_info result;
 
+    result.is_agile = true;
+
+    result.agile = encryption_info::agile_encryption_info{};
+
+    result.agile.key_data.block_size = 16;
+    result.agile.key_data.cipher_algorithm = "AES";
+    result.agile.key_data.cipher_chaining = "CBC";
+    result.agile.key_data.hash_algorithm = "SHA512";
+    result.agile.key_data.hash_size = 64;
+    result.agile.key_data.key_bits = 128;
+    result.agile.key_data.salt_size = 10;
+    result.agile.key_data.salt_value = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+
+    result.agile.data_integrity.hmac_key = { 1, 2, 3 };
+    result.agile.data_integrity.hmac_value = { 3, 4, 5 };
+
+    result.agile.key_encryptor.spin_count = 100000;
+    result.agile.key_encryptor.block_size = 16;
+    result.agile.key_encryptor.cipher_algorithm = "AES";
+    result.agile.key_encryptor.cipher_chaining = "CBC";
+    result.agile.key_encryptor.hash = xlnt::detail::hash_algorithm::sha512;
+    result.agile.key_encryptor.hash_size = 64;
+    result.agile.key_encryptor.key_bits = 128;
+    result.agile.key_encryptor.salt_size = 10;
+    result.agile.key_encryptor.salt_value = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+    result.agile.key_encryptor.verifier_hash_input = { 1, 2, 3 };
+    result.agile.key_encryptor.verifier_hash_value = { 1, 2, 3 };
+    result.agile.key_encryptor.encrypted_key_value = { 3, 4, 5 };
+
     result.agile.key_data.salt_value.assign(
         reinterpret_cast<const std::uint8_t *>(password.data()),
         reinterpret_cast<const std::uint8_t *>(password.data() + password.size()));