diff options
| author | Simon Warta <[email protected]> | 2015-07-12 01:13:13 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2015-07-12 01:13:13 +0200 |
| commit | 681805cf95b72d1c407f7c5f9a3569ec3fae6303 (patch) | |
| tree | 8c8f77d1f88706a71f0928388a8b7d7cee37280d /src | |
| parent | d1b75ea89fa90ef9534a797c9bdb67d2f58a6d2b (diff) | |
| parent | b06417e6e47cef21dd79493b6375dd827d79b97f (diff) | |
Merge pull request #189 from webmaster128/minimal-modules-ci
Add modules all/min to travis matrix
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/vendor/openssl/openssl_rsa.cpp | 6 | ||||
| -rwxr-xr-x | src/scripts/ci/build.sh | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/lib/vendor/openssl/openssl_rsa.cpp b/src/lib/vendor/openssl/openssl_rsa.cpp index 214f1667d..ef86bf91a 100644 --- a/src/lib/vendor/openssl/openssl_rsa.cpp +++ b/src/lib/vendor/openssl/openssl_rsa.cpp @@ -5,6 +5,10 @@ * Botan is released under the Simplified BSD License (see license.txt) */ +#include <botan/build.h> + +#if defined(BOTAN_HAS_RSA) + #include <botan/rsa.h> #include <botan/internal/pk_utils.h> #include <functional> @@ -146,3 +150,5 @@ BOTAN_REGISTER_TYPE(PK_Ops::Decryption, OpenSSL_RSA_Decryption_Operation, "RSA", } } + +#endif // BOTAN_HAS_RSA diff --git a/src/scripts/ci/build.sh b/src/scripts/ci/build.sh index c87033f68..684cca437 100755 --- a/src/scripts/ci/build.sh +++ b/src/scripts/ci/build.sh @@ -13,7 +13,14 @@ elif [ "$BUILD_MODE" = "sanitizer" ]; then CFG_FLAGS="--build-mode=sanitizer" fi +if [ "$MODULES" = "min" ]; then + CFG_FLAGS="$CFG_FLAGS --no-autoload --enable-modules=base" +fi + $CXX --version python configure.py $CFG_FLAGS --cc=$CC --cc-bin=$CXX --with-openssl --with-sqlite --with-zlib make -j 2 -./botan-test + +if [ "$MODULES" != "min" ]; then + ./botan-test +fi |