diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix --- a/nix/dev-shell.nix +++ b/nix/dev-shell.nix @@ -12,7 +12,6 @@ , cmake-format , cocoapods , corrosion -, cryptopp , darwin , double-conversion , folly @@ -73,7 +72,6 @@ # Tunnelbroker + CMake amqp-cpp c-ares_cmake-config - cryptopp cmake cmake-format # linting libuv diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile --- a/services/tunnelbroker/Dockerfile +++ b/services/tunnelbroker/Dockerfile @@ -20,7 +20,6 @@ # Install SDKs RUN ./install_amqp_cpp.sh -RUN ./install_cryptopp.sh RUN ./install_libuv.sh # Copying of the shared code diff --git a/services/tunnelbroker/build.rs b/services/tunnelbroker/build.rs --- a/services/tunnelbroker/build.rs +++ b/services/tunnelbroker/build.rs @@ -42,7 +42,6 @@ println!("cargo:rustc-link-lib=gflags"); println!("cargo:rustc-link-lib=amqpcpp"); println!("cargo:rustc-link-lib=glog"); - println!("cargo:rustc-link-lib=cryptopp"); println!("cargo:rustc-link-lib=ssl"); println!("cargo:rustc-link-lib=uv"); println!("cargo:rustc-link-lib=aws-cpp-sdk-core"); diff --git a/services/tunnelbroker/docker/install_cryptopp.sh b/services/tunnelbroker/docker/install_cryptopp.sh deleted file mode 100755 --- a/services/tunnelbroker/docker/install_cryptopp.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -set -e - -cd /tmp - -git clone --recurse-submodules -b CRYPTOPP_8_6_0 --single-branch https://github.com/weidai11/cryptopp -pushd cryptopp -mkdir build -make CXXFLAGS="-DNDEBUG -g2 -O3 -std=c++11" -make libcryptopp.pc -make install - -popd # cryptopp -rm -rf cryptopp diff --git a/services/tunnelbroker/src/libcpp/test/CMakeLists.txt b/services/tunnelbroker/src/libcpp/test/CMakeLists.txt --- a/services/tunnelbroker/src/libcpp/test/CMakeLists.txt +++ b/services/tunnelbroker/src/libcpp/test/CMakeLists.txt @@ -37,13 +37,6 @@ find_package(glog REQUIRED) find_package(GTest REQUIRED) -# Find Cryptopp installation -pkg_check_modules(CRYPTOPP - REQUIRED - IMPORTED_TARGET - libcryptopp=8.6 -) - # Find Libuv installation pkg_check_modules(LIBUV REQUIRED @@ -72,7 +65,6 @@ ${AWSSDK_LINK_LIBRARIES} ${Boost_LIBRARIES} - PkgConfig::CRYPTOPP PkgConfig::LIBUV amqpcpp OpenSSL::SSL