8000 moved SSL files into separate directory · gauravkumar37/arangodb@bf16086 · GitHub
[go: up one dir, main page]
Skip to content

Commit bf16086

Browse files
fcellerfceller
committed
moved SSL files into separate directory
1 parent 738b6db commit bf16086

File tree

17 files changed

+140
-178
lines changed

17 files changed

+140
-178
lines changed

‎arangod/Aql/Functions.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,37 @@
2222
////////////////////////////////////////////////////////////////////////////////
2323

2424
#include "Functions.h"
25+
26+
#include <velocypack/Collection.h>
27+
#include <velocypack/Dumper.h>
28+
#include <velocypack/Iterator.h>
29+
#include <velocypack/velocypack-aliases.h>
30+
2531
#include "Aql/Function.h"
2632
#include "Aql/Query.h"
2733
#include "Basics/Exceptions.h"
28-
#include "Basics/fpconv.h"
2934
#include "Basics/ScopeGuard.h"
3035
#include "Basics/StringBuffer.h"
31-
#include "Basics/tri-strings.h"
3236
#include "Basics/Utf8Helper.h"
33-
#include "Basics/VelocyPackHelper.h"
3437
#include "Basics/VPackStringBufferAdapter.h"
38+
#include "Basics/VelocyPackHelper.h"
39+
#include "Basics/fpconv.h"
40+
#include "Basics/tri-strings.h"
3541
#include "FulltextIndex/fulltext-index.h"
36-
#include "FulltextIndex/fulltext-result.h"
3742
#include "FulltextIndex/fulltext-query.h"
38-
#include "Indexes/Index.h"
43+
#include "FulltextIndex/fulltext-result.h"
3944
#include "Indexes/EdgeIndex.h"
4045
#include "Indexes/FulltextIndex.h"
4146
#include "Indexes/GeoIndex2.h"
42-
#include "Rest/SslInterface.h"
47+
#include "Indexes/Index.h"
48+
#include "Ssl/SslInterface.h"
4349
#include "Utils/OperationCursor.h"
4450
#include "Utils/OperationOptions.h"
4551
#include "Utils/OperationResult.h"
4652
#include "Utils/Transaction.h"
4753
#include "V8Server/V8Traverser.h"
4854
#include "VocBase/KeyGenerator.h"
4955

50-
#include <velocypack/Collection.h>
51-
#include <velocypack/Dumper.h>
52-
#include <velocypack/Iterator.h>
53-
#include <velocypack/velocypack-aliases.h>
54-
5556
using namespace arangodb;
5657
using namespace arangodb::aql;
5758

‎arangod/HttpServer/HttpsCommTask.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626

2727
#include <openssl/err.h>
2828

29-
#include "Logger/Logger.h"
30-
#include "Basics/socket-utils.h"
31-
#include "Basics/ssl-helper.h"
3229
#include "Basics/StringBuffer.h"
30+
#include "Basics/socket-utils.h"
3331
#include "HttpServer/HttpsServer.h"
32+
#include "Logger/Logger.h"
3433
#include "Scheduler/Scheduler.h"
34+
#include "Ssl/ssl-helper.h"
3535

3636
using namespace arangodb;
3737
using namespace arangodb::rest;

‎arangod/RestServer/RestServerFeature.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222

2323
#include "RestServerFeature.h"
2424

25-
#include "ApplicationFeatures/SslFeature.h"
26-
#include "Aql/RestAqlHandler.h"
2725
#include "Agency/AgencyFeature.h"
2826
#include "Agency/RestAgencyHandler.h"
2927
#include "Agency/RestAgencyPrivHandler.h"
28+
#include "Aql/RestAqlHandler.h"
3029
#include "Cluster/AgencyCallbackRegistry.h"
3130
#include "Cluster/ClusterComm.h"
3231
#include "Cluster/ClusterFeature.h"
@@ -66,6 +65,7 @@
6665
#include "RestServer/QueryRegistryFeature.h"
6766
#include "RestServer/ServerFeature.h"
6867
#include "Scheduler/SchedulerFeature.h"
68+
#include "Ssl/SslFeature.h"
6969
#include "V8Server/V8DealerFeature.h"
7070
#include "VocBase/server.h"
7171

‎arangod/RestServer/arangod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "ApplicationFeatures/NonceFeature.h"
3232
#include "ApplicationFeatures/PrivilegeFeature.h"
3333
#include "ApplicationFeatures/ShutdownFeature.h"
34-
#include "ApplicationFeatures/SslFeature.h"
3534
#include "ApplicationFeatures/SupervisorFeature.h"
3635
#include "ApplicationFeatures/TempFeature.h"
3736
#include "ApplicationFeatures/V8PlatformFeature.h"
@@ -60,6 +59,7 @@
6059
#include "RestServer/UnitTestsFeature.h"
6160
#include "RestServer/UpgradeFeature.h"
6261
#include "Scheduler/SchedulerFeature.h"
62+
#include "Ssl/SslFeature.h"
6363
#include "Statistics/StatisticsFeature.h"
6464
#include "V8Server/FoxxQueuesFeature.h"
6565
#include "V8Server/V8DealerFeature.h"

‎arangod/VocBase/auth.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
////////////////////////////////////////////////////////////////////////////////
2323

2424
#include "auth.h"
25+
2526
#include "Basics/ReadLocker.h"
2627
#include "Basics/VelocyPackHelper.h"
2728
#include "Basics/WriteLocker.h"
2829
#include "Basics/hashes.h"
2930
#include "Basics/tri-strings.h"
3031
#include "Logger/Logger.h"
31-
#include "Rest/SslInterface.h"
32+
#include "Ssl/SslInterface.h"
3233
#include "Utils/SingleCollectionTransaction.h"
3334
#include "Utils/StandaloneTransactionContext.h"
3435
#include "VocBase/collection.h"

‎arangosh/Dump/DumpFeature.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
#include "ProgramOptions/ProgramOptions.h"
3333
#include "Rest/HttpResponse.h"
3434
#include "Rest/Version.h"
35-
#include "Rest/SslInterface.h"
3635
#include "SimpleHttpClient/GeneralClientConnection.h"
3736
#include "SimpleHttpClient/SimpleHttpClient.h"
3837
#include "SimpleHttpClient/SimpleHttpResult.h"
38+
#include "Ssl/SslInterface.h"
3939

4040
#include <velocypack/Iterator.h>
4141
#include <velocypack/velocypack-aliases.h>

‎arangosh/Restore/RestoreFeature.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
#include "ProgramOptions/ProgramOptions.h"
3434
#include "Rest/HttpResponse.h"
3535
#include "Rest/InitializeRest.h"
36-
#include "Rest/SslInterface.h"
3736
#include "Rest/Version.h"
3837
#include "SimpleHttpClient/GeneralClientConnection.h"
3938
#include "SimpleHttpClient/SimpleHttpClient.h"
4039
#include "SimpleHttpClient/SimpleHttpResult.h"
40+
#include "Ssl/SslInterface.h"
4141

4242
#include <velocypack/Options.h>
4343
#include <velocypack/velocypack-aliases.h>

‎lib/CMakeLists.txt

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,42 +27,7 @@ if (USE_MAINTAINER_MODE)
2727

2828
add_custom_command(
2929
OUTPUT
30-
${CMAKE_CURRENT_SOURCE_DIR}/lib/JsonParser.cpp
31-
WORKING_DIRECTORY
32-
${CMAKE_CURRENT_SOURCE_DIR}
33-
COMMAND
34-
${CMAKE_SOURCE_DIR}/utils/flex-c++.sh
35-
${FLEX_EXECUTABLE}
36-
V8/v8-json.ll
37-
V8/v8-json.cpp
38-
MAIN_DEPENDENCY
39-
${CMAKE_CURRENT_SOURCE_DIR}/V8/v8-json.ll
40-
VERBATIM
41-
)
42-
endif ()
43-
44-
# note that we check-in the generated FLEX/BISON files, therefore they are
45-
# generate inside the source tree
46-
47-
if (USE_MAINTAINER_MODE)
48-
add_custom_command(
49-
OUTPUT
50-
${CMAKE_CURRENT_SOURCE_DIR}/lib/JsonParser/json-parser.cpp
51-
WORKING_DIRECTORY
52-
${CMAKE_CURRENT_SOURCE_DIR}
53-
COMMAND
54-
${CMAKE_SOURCE_DIR}/utils/flex-c++.sh
55-
${FLEX_EXECUTABLE}
56-
lib/JsonParser/json-parser.ll
57-
lib/JsonParser/json-parser.cpp
58-
MAIN_DEPENDENCY
59-
${CMAKE_CURRENT_SOURCE_DIR}/lib/JsonParser/json-parser.ll
60-
VERBATIM
61-
)
62-
63-
add_custom_command(
64-
OUTPUT
65-
${CMAKE_CURRENT_SOURCE_DIR}/lib/JsonParser.cpp
30+
${CMAKE_CURRENT_SOURCE_DIR}/lib/V8/v8-json.cpp
6631
WORKING_DIRECTORY
6732
${CMAKE_CURRENT_SOURCE_DIR}
6833
COMMAND
@@ -161,7 +126,6 @@ add_library(${LIB_ARANGO} STATIC
161126
ApplicationFeatures/NonceFeature.cpp
162127
ApplicationFeatures/PrivilegeFeature.cpp
163128
ApplicationFeatures/ShutdownFeature.cpp
164-
ApplicationFeatures/SslFeature.cpp
165129
ApplicationFeatures/TempFeature.cpp
166130
ApplicationFeatures/V8PlatformFeature.cpp
167131
ApplicationFeatures/VersionFeature.cpp
@@ -207,7 +171,6 @@ add_library(${LIB_ARANGO} STATIC
207171
Basics/prime-numbers.cpp
208172
Basics/process-utils.cpp
209173
Basics/socket-utils.cpp
210-
Basics/ssl-helper.cpp
211174
Basics/structures.cpp
212175
Basics/system-functions.cpp
213176
Basics/terminal-utils.cpp
@@ -243,14 +206,16 @@ add_library(${LIB_ARANGO} STATIC
243206
Rest/HttpRequest.cpp
244207
Rest/HttpResponse.cpp
245208
Rest/InitializeRest.cpp
246-
Rest/SslInterface.cpp
247209
Rest/Version.cpp
248210
SimpleHttpClient/ClientConnection.cpp
249211
SimpleHttpClient/ConnectionManager.cpp
250212
SimpleHttpClient/GeneralClientConnection.cpp
251213
SimpleHttpClient/SimpleHttpClient.cpp
252214
SimpleHttpClient/SimpleHttpResult.cpp
253215
SimpleHttpClient/SslClientConnection.cpp
216+
Ssl/SslFeature.cpp
217+
Ssl/SslInterface.cpp
218+
Ssl/ssl-helper.cpp
254219
Utilities/LineEditor.cpp
255220
Utilities/ScriptLoader.cpp
256221
Utilities/ShellBase.cpp

‎lib/Rest/InitializeRest.cpp

Lines changed: 0 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@
2323

2424
#include "InitializeRest.h"
2525

26-
#include <openssl/ssl.h>
27-
#include <openssl/err.h>
28-
29-
#define OPENSSL_THREAD_DEFINES
30-
31-
#include <openssl/opensslconf.h>
32-
33-
#ifndef OPENSSL_THREADS
34-
#error missing thread support for openssl, please recomple OpenSSL with threads
35-
#endif
36-
3726
#include "Basics/Thread.h"
3827
#include "Basics/VelocyPackHelper.h"
3928
#include "Basics/error.h"
@@ -50,97 +39,6 @@ using namespace arangodb;
5039
using namespace arangodb::basics;
5140
using namespace arangodb::rest;
5241

53-
// -----------------------------------------------------------------------------
54-
// OPEN SSL support
55-
// -----------------------------------------------------------------------------
56-
57-
namespace {
58-
long* opensslLockCount;
59-
TRI_mutex_t* opensslLocks;
60-
61-
#if OPENSSL_VERSION_NUMBER < 0x01000000L
62-
63-
unsigned long opensslThreadId() { return (unsigned long)TRI_CurrentThreadId(); }
64-
65-
#else
66-
67-
// The compiler chooses the right one from the following two,
68-
// according to the type of the return value of pthread_self():
69-
70-
#ifndef __sun
71-
template <typename T>
72-
void setter(CRYPTO_THREADID* id, T p) {
73-
CRYPTO_THREADID_set_pointer(id, p);
74-
}
75-
#else
76-
template <typename T>
77-
void setter(CRYPTO_THREADID* id, T p) {
78-
CRYPTO_THREADID_set_pointer(id, (void*)(intptr_t)p);
79-
}
80-
#endif
81-
82-
#ifndef __APPLE__
83-
template <>
84-
void setter(CRYPTO_THREADID* id, unsigned long val) {
85-
CRYPTO_THREADID_set_numeric(id, val);
86-
}
87-
#endif
88-
89-
static void arango_threadid_func(CRYPTO_THREADID* id) {
90-
auto self = Thread::currentThreadId();
91-
92-
setter<decltype(self)>(id, self);
93-
}
94-
95-
#endif
96-
97-
void opensslLockingCallback(int mode, int type, char const* /* file */,
98-
int /* line */) {
99-
if (mode & CRYPTO_LOCK) {
100-
TRI_LockMutex(&(opensslLocks[type]));
101-
opensslLockCount[type]++;
102-
} else {
103-
TRI_UnlockMutex(&(opensslLocks[type]));
104-
}
105-
}
106-
107-
void opensslSetup() {
108-
opensslLockCount = (long*)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
109-
opensslLocks =
110-
(TRI_mutex_t*)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(TRI_mutex_t));
111-
112-
for (long i = 0; i < CRYPTO_num_locks(); ++i) {
113-
opensslLockCount[i] = 0;
114-
TRI_InitMutex(&(opensslLocks[i]));
115-
}
116-
117-
#if OPENSSL_VERSION_NUMBER < 0x01000000L
118-
CRYPTO_set_id_callback(opensslThreadId);
119-
CRYPTO_set_locking_callback(opensslLockingCallback);
120-
#else
121-
CRYPTO_THREADID_set_callback(arango_threadid_func);
122-
CRYPTO_set_locking_callback(opensslLockingCallback);
123-
#endif
124-
}
125-
126-
void opensslCleanup() {
127-
CRYPTO_set_locking_callback(nullptr);
128-
129-
#if OPENSSL_VERSION_NUMBER < 0x01000000L
130-
CRYPTO_set_id_callback(nullptr);
131-
#else
132-
CRYPTO_THREADID_set_callback(nullptr);
133-
#endif
134-
135-
for (long i = 0; i < CRYPTO_num_locks(); ++i) {
136-
TRI_DestroyMutex(&(opensslLocks[i]));
137-
}
138-
139-
OPENSSL_free(opensslLocks);
140-
OPENSSL_free(opensslLockCount);
141-
}
142-
}
143-
14442
using namespace arangodb::basics;
14543

14644
// -----------------------------------------------------------------------------
@@ -167,24 +65,11 @@ void InitializeRest() {
16765
pthread_cond_broadcast(&cond);
16866
#endif
16967

170-
SSL_library_init();
171-
SSL_load_error_strings();
172-
OpenSSL_add_all_algorithms();
173-
ERR_load_crypto_strings();
174-
175-
opensslSetup();
176-
17768
Version::initialize();
17869
VelocyPackHelper::initialize();
17970
}
18071

18172
void ShutdownRest() {
182-
opensslCleanup();
183-
184-
ERR_free_strings();
185-
EVP_cleanup();
186-
CRYPTO_cleanup_all_ex_data();
187-
18873
RandomGenerator::shutdown();
18974

19075
TRI_ShutdownProcess();

‎lib/SimpleHttpClient/SslClientConnection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
#include <openssl/ssl.h>
3636

37-
#include "Basics/ssl-helper.h"
3837
#include "Basics/socket-utils.h"
38+
#include "Ssl/ssl-helper.h"
3939

4040
#ifdef _WIN32
4141
#define STR_ERROR() \

0 commit comments

Comments
 (0)
0