mirror of
https://github.com/tfussell/xlnt.git
synced 2024-03-22 13:11:17 +08:00
call botan configure directly and elaborate hash_algorithm type
This commit is contained in:
parent
3eb4044d34
commit
5c1cc5f3a7
|
@ -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
|
|
@ -71,7 +71,8 @@ set(POLE ../third-party/pole/pole.cpp)
|
|||
set(BOTAN ../third-party/botan/botan_all.cpp)
|
||||
|
||||
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}")
|
||||
|
||||
if(SHARED)
|
||||
|
|
|
@ -307,7 +307,7 @@ struct agile_encryption_info
|
|||
std::size_t hash_size;
|
||||
std::string cipher_algorithm;
|
||||
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> verifier_hash_input;
|
||||
std::vector<std::uint8_t> verifier_hash_value;
|
||||
|
|
Loading…
Reference in New Issue
Block a user