StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

call botan configure directly and elaborate hash_algorithm type

Browse Source
This commit is contained in:
Thomas Fussell 2016-10-24 22:42:23 -04:00
parent 3eb4044d34
commit 5c1cc5f3a7
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/build-botan-amalgamation
View File

@ -1,3 +0,0 @@
cd ${0%/*}
cd ../third-party/botan
python configure.py --minimized-build --enable-modules=sha1,aes,filters,codec_filt,cbc,ecb,sha2_32,sha2_64 --disable-shared --amalgamation

3
cmake/xlnt.cmake
View File

@ -71,7 +71,8 @@ set(POLE ../third-party/pole/pole.cpp)
set(BOTAN ../third-party/botan/botan_all.cpp) set(BOTAN ../third-party/botan/botan_all.cpp)
add_custom_command(OUTPUT ${BOTAN} add_custom_command(OUTPUT ${BOTAN}
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/cmake/build-botan-amalgamation ${CMAKE_CURRENT_BINARY_DIR} COMMAND python configure.py --minimized-build --enable-modules=sha1,aes,filters,codec_filt,cbc,ecb,sha2_32,sha2_64 --disable-shared --amalgamation
WORKING_DIRECTORY ../third-party/botan
COMMENT "Generating botan amalgamation ${BOTAN}") COMMENT "Generating botan amalgamation ${BOTAN}")
if(SHARED) if(SHARED)

2
source/detail/xlsx_crypto.cpp
View File

@ -307,7 +307,7 @@ struct agile_encryption_info
std::size_t hash_size; std::size_t hash_size;
std::string cipher_algorithm; std::string cipher_algorithm;
std::string cipher_chaining; std::string cipher_chaining;
hash_algorithm hash_algorithm; enum class hash_algorithm hash_algorithm;
std::vector<std::uint8_t> salt_value; std::vector<std::uint8_t> salt_value;
std::vector<std::uint8_t> verifier_hash_input; std::vector<std::uint8_t> verifier_hash_input;
std::vector<std::uint8_t> verifier_hash_value; std::vector<std::uint8_t> verifier_hash_value;