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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt
index b96fb5f..8f3a500 100644
--- a/osquery/CMakeLists.txt
+++ b/osquery/CMakeLists.txt
@@ -98,6 +98,9 @@ ADD_OSQUERY_LINK_CORE("glog")
ADD_OSQUERY_LINK_CORE("boost_system")
ADD_OSQUERY_LINK_CORE("boost_filesystem")
ADD_OSQUERY_LINK_CORE("boost_regex")
+ADD_OSQUERY_LINK_CORE("bz2")
+ADD_OSQUERY_LINK_CORE("cryptsetup")
+ADD_OSQUERY_LINK_CORE("lz4")
# TODO(#1956): Ignoring on WIN32 for now
if(NOT WIN32)
diff --git a/osquery/remote/transports/tls.cpp b/osquery/remote/transports/tls.cpp
index 4273293..f181af9 100644
--- a/osquery/remote/transports/tls.cpp
+++ b/osquery/remote/transports/tls.cpp
@@ -30,12 +30,12 @@ SSL_CTX* TLSv1_2_method(void) { return nullptr; }
SSL_CTX* TLSv1_2_server_method(void) { return nullptr; }
#endif
#if defined(NO_SSL_TXT_SSLV3)
-SSL_METHOD* SSLv3_server_method(void) { return nullptr; }
-SSL_METHOD* SSLv3_client_method(void) { return nullptr; }
-SSL_METHOD* SSLv3_method(void) { return nullptr; }
-SSL_METHOD* SSLv2_server_method(void) { return nullptr; }
-SSL_METHOD* SSLv2_client_method(void) { return nullptr; }
-SSL_METHOD* SSLv2_method(void) { return nullptr; }
+const SSL_METHOD* SSLv3_server_method(void) { return nullptr; }
+const SSL_METHOD* SSLv3_client_method(void) { return nullptr; }
+const SSL_METHOD* SSLv3_method(void) { return nullptr; }
+const SSL_METHOD* SSLv2_server_method(void) { return nullptr; }
+const SSL_METHOD* SSLv2_client_method(void) { return nullptr; }
+const SSL_METHOD* SSLv2_method(void) { return nullptr; }
#endif
#endif
}
diff --git a/osquery/remote/transports/tls.h b/osquery/remote/transports/tls.h
index 751c416..55038dc 100644
--- a/osquery/remote/transports/tls.h
+++ b/osquery/remote/transports/tls.h
@@ -27,9 +27,9 @@
/// Newer versions of LibreSSL will lack SSL methods.
extern "C" {
#if defined(NO_SSL_TXT_SSLV3)
-SSL_METHOD* SSLv3_server_method(void);
-SSL_METHOD* SSLv3_client_method(void);
-SSL_METHOD* SSLv3_method(void);
+const SSL_METHOD* SSLv3_server_method(void);
+const SSL_METHOD* SSLv3_client_method(void);
+const SSL_METHOD* SSLv3_method(void);
#endif
void ERR_remove_state(unsigned long);
}
diff --git a/tools/provision.sh b/tools/provision.sh
index 7ca0498..3dc412c 100755
--- a/tools/provision.sh
+++ b/tools/provision.sh
@@ -93,11 +93,6 @@ function main() {
cd "$SCRIPT_DIR/../"
- # Pip may have just been installed.
- PIP=`which pip`
- sudo $PIP install --upgrade pip
- sudo $PIP install -r requirements.txt
-
initialize $OS
}
diff --git a/tools/provision/arch.sh b/tools/provision/arch.sh
index d6498d4..73759b6 100755
--- a/tools/provision/arch.sh
+++ b/tools/provision/arch.sh
@@ -8,8 +8,6 @@
# of patent rights can be found in the PATENTS file in the same directory.
function main_arch() {
- sudo pacman -Syu
-
package wget
package asio
package audit
@@ -29,13 +27,4 @@ function main_arch() {
package snappy
package thrift
package yara
-
- install_aws_sdk
-
- echo ""
- echo "The following packages need to be installed from the AUR:"
- echo "rocksdb or rocksdb-static (if using rocksdb export BUILD_LINK_SHARED=True)"
- echo "cpp-netlib and magic"
- echo ""
}
-
|