blob: b1ef69503586cbe3789bdd2f958c5db967e42475 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
diff --git a/src/cpp/core/CMakeLists.txt b/src/cpp/core/CMakeLists.txt
index 3990f893d3..d5b390dacf 100644
--- a/src/cpp/core/CMakeLists.txt
+++ b/src/cpp/core/CMakeLists.txt
@@ -202,8 +202,12 @@ if (UNIX)
endif()
if(RSTUDIO_SERVER)
- find_package(OpenSSL REQUIRED QUIET)
+ #find_package(OpenSSL REQUIRED QUIET)
find_package(PAM REQUIRED)
+ find_library(SSL ssl PATHS /usr/lib/openssl-1.0)
+ find_library(CRYPTO crypto PATHS /usr/lib/openssl-1.0)
+ set(OPENSSL_INCLUDE_DIRS /usr/include/openssl-1.0)
+ set(OPENSSL_LIBRARIES /usr/lib/openssl-1.0/libssl.so /usr/lib/openssl-1.0/libcrypto.so)
set(CORE_SYSTEM_LIBRARIES
${CORE_SYSTEM_LIBRARIES}
${OPENSSL_LIBRARIES}
diff --git a/src/cpp/core/system/Crypto.cpp b/src/cpp/core/system/Crypto.cpp
index da286d2950..4569e8ba07 100644
--- a/src/cpp/core/system/Crypto.cpp
+++ b/src/cpp/core/system/Crypto.cpp
@@ -18,14 +18,14 @@
#include <fcntl.h>
-#include <openssl/err.h>
-#include <openssl/hmac.h>
-#include <openssl/bio.h>
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
+#include <openssl-1.0/openssl//err.h>
+#include <openssl-1.0/openssl//hmac.h>
+#include <openssl-1.0/openssl//bio.h>
+#include <openssl-1.0/openssl//buffer.h>
+#include <openssl-1.0/openssl//evp.h>
+#include <openssl-1.0/openssl//pem.h>
+#include <openssl-1.0/openssl//rand.h>
+#include <openssl-1.0/openssl//rsa.h>
#include <algorithm>
|