From 27efeb8d6b67a5121d2c05de13444f1bb5c3c420 Mon Sep 17 00:00:00 2001
From: Paul Shapiro <paulshapiro@users.noreply.github.com>
Date: Wed, 22 Aug 2018 20:51:35 -0400
Subject: [PATCH] updated to mooo's new openssl-less bulletproofs impl and
 removed openssl

---
 CMakeLists.txt                                    | 7 -------
 bin/{buildAndRun_tests__Mac => buildAndRun_tests} | 2 +-
 bin/genXcodeProj                                  | 2 +-
 contrib/monero-core-custom                        | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)
 rename bin/{buildAndRun_tests__Mac => buildAndRun_tests} (65%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cb49af..bcd6015 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,12 +6,6 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 project(TEST)
 enable_testing()
 
-#Find openSSL
-find_package(OpenSSL COMPONENTS
-	crypto REQUIRED
-	ssl REQUIRED
-)
-
 #Prep ourselves for compiling boost
 find_package(Boost COMPONENTS 
     unit_test_framework REQUIRED
@@ -138,7 +132,6 @@ foreach(testSrc ${TEST_SRCS})
     target_link_libraries(
         ${testName}
         #
-        OpenSSL::SSL
         ${Boost_LIBRARIES} 
     )
     set_target_properties(
diff --git a/bin/buildAndRun_tests__Mac b/bin/buildAndRun_tests
similarity index 65%
rename from bin/buildAndRun_tests__Mac
rename to bin/buildAndRun_tests
index 26d34d2..f5de2bc 100755
--- a/bin/buildAndRun_tests__Mac
+++ b/bin/buildAndRun_tests
@@ -3,6 +3,6 @@
 mkdir -p build;
 
 cd build && 
-cmake  .. -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl &&
+cmake  .. &&
 cmake --build . &&
 CTEST_OUTPUT_ON_FAILURE=1 ctest -VV
diff --git a/bin/genXcodeProj b/bin/genXcodeProj
index 626fdbc..56c0ad7 100755
--- a/bin/genXcodeProj
+++ b/bin/genXcodeProj
@@ -5,7 +5,7 @@
 ESCAPEDSRCROOT="$(pwd | sed 's/\//\\\//g')";
 mkdir -p xcode;
 cd xcode && 
-cmake -G Xcode .. -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl &&
+cmake -G Xcode .. &&
 echo "$ 's/$ESCAPEDSRCROOT/\${SRCROOT}/g'" && #remove personally identifying info of proj generator
 LC_CTYPE=C LANG=C find TEST.xcodeproj -type f -print0 -exec sed -i "" 's/'"$ESCAPEDSRCROOT"'/${SRCROOT}/g' {} + &&
 
diff --git a/contrib/monero-core-custom b/contrib/monero-core-custom
index e7d1ce7..e089dec 160000
--- a/contrib/monero-core-custom
+++ b/contrib/monero-core-custom
@@ -1 +1 @@
-Subproject commit e7d1ce718a1003ac76039d03492a440973d7d9eb
+Subproject commit e089dec813e7c9b51b8ded08bf8017e0395c4155