Cryptoconditions (RIPD-1139) #2170
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -465,16 +465,18 @@ if (WIN32 OR is_xcode) | |
| endif() | ||
|
|
||
| if(unity) | ||
| add_executable(rippled ${rippled_src_unity} ${PROTO_HDRS}) | ||
| add_executable(rippled_classic EXCLUDE_FROM_ALL ${rippled_src_nonunity} ${PROTO_HDRS}) | ||
| set(other_target rippled_classic) | ||
| else() | ||
| add_executable(rippled ${rippled_src_nonunity} ${PROTO_HDRS}) | ||
| add_executable(rippled_unity EXCLUDE_FROM_ALL ${rippled_src_unity} ${PROTO_HDRS}) | ||
| set(other_target rippled_unity) | ||
| endif() | ||
|
|
||
| list(APPEND targets "rippled") | ||
| list(APPEND targets ${other_target}) | ||
|
|
||
| # Not the same as EXCLUDE_FROM_ALL. Prevents Visual Studio from building the | ||
| # other_target when the user builds the solution (default when pressing <F7>) | ||
| set_property(TARGET ${other_target} PROPERTY EXCLUDE_FROM_DEFAULT_BUILD true) | ||
|
|
@@ -530,11 +532,45 @@ set_startup_project(rippled) | |
|
|
||
| foreach(target IN LISTS targets) | ||
| target_link_libraries(${target} | ||
| ${OPENSSL_LIBRARIES} ${PROTOBUF_LIBRARIES}) | ||
|
|
||
| link_common_libraries(${target}) | ||
| endforeach() | ||
|
|
||
| if (fuzzer_conditions) | ||
|
There was a problem hiding this comment. I don't think there is much need for a user-defined variable for this since you can just set it based on the There was a problem hiding this comment. I'd like to keep this variable. If we add other fuzzers I think we want to control which fuzzers we are building. I don't mind the slightly clunkier build step for this because it's an uncommon build target. |
||
| set(FuzzerSrc | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/Condition.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/DerCommon.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/DerTraits.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/DerCoder.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/Ed25519.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/error.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/Fulfillment.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/PrefixSha256.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/PreimageSha256.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/RsaSha256.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/conditions/impl/ThresholdSha256.cpp | ||
|
|
||
| ${CMAKE_SOURCE_DIR}/src/ripple/basics/impl/contract.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/basics/impl/Log.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/beast/utility/src/beast_Journal.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/ripple/basics/impl/Time.cpp | ||
| ${CMAKE_SOURCE_DIR}/src/fuzzers/Conditions_fuzz_test.cpp) | ||
|
|
||
| add_with_props(FuzzerSrc src/ripple/unity/ed25519_donna.c | ||
| -I"${CMAKE_SOURCE_DIR}/"src/ed25519-donna) | ||
|
|
||
| add_executable(fulfillment_fuzzer ${FuzzerSrc}) | ||
| target_link_libraries(fulfillment_fuzzer ${OPENSSL_LIBRARIES}) | ||
| link_common_libraries(fulfillment_fuzzer) | ||
| target_compile_definitions(fulfillment_fuzzer PUBLIC -DFUZZ_TEST_FULFILLMENT) | ||
|
|
||
| add_executable(condition_fuzzer ${FuzzerSrc}) | ||
| target_link_libraries(condition_fuzzer ${OPENSSL_LIBRARIES}) | ||
| link_common_libraries(condition_fuzzer) | ||
| target_compile_definitions(condition_fuzzer PUBLIC -DFUZZ_TEST_CONDITION) | ||
| endif() | ||
|
|
||
| if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) | ||
| message(WARNING "Rippled requires a 64 bit target architecture.\n" | ||
| "The most likely cause of this warning is trying to build rippled with a 32-bit OS.") | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The commit message is marked fold, but please don't lose the instructions for the fuzzer when this is squashed.