summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/client/SConscript68
-rw-r--r--src/mongo/client/native_sasl_client_session.cpp5
-rw-r--r--src/mongo/crypto/SConscript50
-rw-r--r--src/mongo/db/auth/SConscript1
-rw-r--r--src/mongo/shell/SConscript103
5 files changed, 119 insertions, 108 deletions
diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript
index 3b6603f0a1c..2b20792e5ed 100644
--- a/src/mongo/client/SConscript
+++ b/src/mongo/client/SConscript
@@ -41,40 +41,42 @@ env.Library(
],
)
-env.Library(
- target=[
- 'sasl_aws_common',
- ],
- source=[
- env.Idlc('sasl_aws_protocol_common.idl')[0],
- ],
- LIBDEPS_PRIVATE=[
- '$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/db/server_options_core', # For object_check.h
- '$BUILD_DIR/mongo/idl/idl_parser',
- ],
-)
-
-kmsEnv = env.Clone()
-kmsEnv.InjectThirdParty(libraries=['kms-message'])
-
-kmsEnv.Library(
- target=[
- 'sasl_aws_client',
- ],
- source=[
- 'sasl_aws_client_protocol.cpp',
- env.Idlc('sasl_aws_client_protocol.idl')[0],
- ],
- LIBDEPS_PRIVATE=[
- '$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/db/server_options_core', # For object_check.h
- '$BUILD_DIR/mongo/idl/idl_parser',
- '$BUILD_DIR/third_party/shim_kms_message',
- 'sasl_aws_common',
- ],
-)
+if get_option('ssl') == 'on':
+ env.Library(
+ target=[
+ 'sasl_aws_common',
+ ],
+ source=[
+ env.Idlc('sasl_aws_protocol_common.idl')[0],
+ ],
+ LIBDEPS_PRIVATE=[
+ '$BUILD_DIR/mongo/base',
+ '$BUILD_DIR/mongo/db/server_options_core', # For object_check.h
+ '$BUILD_DIR/mongo/idl/idl_parser',
+ ],
+ )
+
+ kmsEnv = env.Clone()
+
+ kmsEnv.InjectThirdParty(libraries=['kms-message'])
+
+ kmsEnv.Library(
+ target=[
+ 'sasl_aws_client',
+ ],
+ source=[
+ 'sasl_aws_client_protocol.cpp',
+ env.Idlc('sasl_aws_client_protocol.idl')[0],
+ ],
+ LIBDEPS_PRIVATE=[
+ '$BUILD_DIR/mongo/base',
+ '$BUILD_DIR/mongo/db/server_options_core', # For object_check.h
+ '$BUILD_DIR/mongo/idl/idl_parser',
+ '$BUILD_DIR/third_party/shim_kms_message',
+ 'sasl_aws_common',
+ ],
+ )
saslClientEnv = env.Clone()
saslLibs = []
diff --git a/src/mongo/client/native_sasl_client_session.cpp b/src/mongo/client/native_sasl_client_session.cpp
index fbdf17266b0..169cc73c6ca 100644
--- a/src/mongo/client/native_sasl_client_session.cpp
+++ b/src/mongo/client/native_sasl_client_session.cpp
@@ -32,7 +32,6 @@
#include "mongo/client/native_sasl_client_session.h"
#include "mongo/base/init.h"
-#include "mongo/client/sasl_aws_client_conversation.h"
#include "mongo/client/sasl_client_conversation.h"
#include "mongo/client/sasl_plain_client_conversation.h"
#include "mongo/client/sasl_scram_client_conversation.h"
@@ -42,6 +41,10 @@
#include "mongo/crypto/sha256_block.h"
#include "mongo/util/str.h"
+#ifdef MONGO_CONFIG_SSL
+#include "mongo/client/sasl_aws_client_conversation.h"
+#endif
+
namespace mongo {
namespace {
diff --git a/src/mongo/crypto/SConscript b/src/mongo/crypto/SConscript
index e4af03ead75..8ee34f90d22 100644
--- a/src/mongo/crypto/SConscript
+++ b/src/mongo/crypto/SConscript
@@ -1,6 +1,9 @@
# -*- mode: python -*-
-Import("env")
+Import([
+ 'env',
+ 'get_option',
+])
env = env.Clone()
@@ -57,29 +60,30 @@ else:
'sha256_block',
])
-env.Library(target='symmetric_crypto',
- source=[
- 'symmetric_crypto.cpp',
- 'symmetric_crypto_${MONGO_CRYPTO}.cpp',
- 'symmetric_key.cpp',
- ],
- LIBDEPS=[
- '$BUILD_DIR/mongo/base/secure_allocator',
- '$BUILD_DIR/mongo/util/net/openssl_init' if 'openssl' in env['MONGO_CRYPTO'] else '',
- '$BUILD_DIR/mongo/util/secure_zero_memory',
- ],
-)
+if get_option('ssl') == 'on':
+ env.Library(target='symmetric_crypto',
+ source=[
+ 'symmetric_crypto.cpp',
+ 'symmetric_crypto_${MONGO_CRYPTO}.cpp',
+ 'symmetric_key.cpp',
+ ],
+ LIBDEPS=[
+ '$BUILD_DIR/mongo/base/secure_allocator',
+ '$BUILD_DIR/mongo/util/net/openssl_init' if 'openssl' in env['MONGO_CRYPTO'] else '',
+ '$BUILD_DIR/mongo/util/secure_zero_memory',
+ ],
+ )
-env.Library(
- target="aead_encryption",
- source=[
- "aead_encryption.cpp",
- ],
- LIBDEPS=[
- '$BUILD_DIR/mongo/db/matcher/expressions',
- 'symmetric_crypto',
- ],
-)
+ env.Library(
+ target="aead_encryption",
+ source=[
+ "aead_encryption.cpp",
+ ],
+ LIBDEPS=[
+ '$BUILD_DIR/mongo/db/matcher/expressions',
+ 'symmetric_crypto',
+ ],
+ )
env.CppUnitTest(
target='crypto_test',
diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript
index 41654b1dd87..eaab17c1073 100644
--- a/src/mongo/db/auth/SConscript
+++ b/src/mongo/db/auth/SConscript
@@ -211,6 +211,7 @@ env.Library(
'$BUILD_DIR/mongo/crypto/sha_block_${MONGO_CRYPTO}',
'$BUILD_DIR/mongo/util/icu',
'$BUILD_DIR/mongo/util/md5',
+ 'auth',
'sasl_options',
'security_file',
'user',
diff --git a/src/mongo/shell/SConscript b/src/mongo/shell/SConscript
index bc9a160bcf6..95465a8bfbb 100644
--- a/src/mongo/shell/SConscript
+++ b/src/mongo/shell/SConscript
@@ -139,62 +139,63 @@ env.Library(
]
)
-kmsEnv = env.Clone()
+if get_option('ssl') == 'on':
+ kmsEnv = env.Clone()
-kmsEnv.InjectThirdParty(libraries=['kms-message'])
+ kmsEnv.InjectThirdParty(libraries=['kms-message'])
-kmsEnv.Library(
- target="kms",
- source=[
- "kms.cpp",
- "kms_aws.cpp",
- "kms_local.cpp",
- kmsEnv.Idlc("kms.idl")[0],
- ],
- LIBDEPS=[
- '$BUILD_DIR/mongo/base/secure_allocator',
- ],
- LIBDEPS_PRIVATE=[
- '$BUILD_DIR/mongo/base',
- '$BUILD_DIR/mongo/crypto/aead_encryption',
- '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
- '$BUILD_DIR/mongo/util/net/network',
- '$BUILD_DIR/mongo/util/net/ssl_manager',
- '$BUILD_DIR/mongo/util/net/ssl_options',
- '$BUILD_DIR/third_party/shim_kms_message',
- ],
-)
+ kmsEnv.Library(
+ target="kms",
+ source=[
+ "kms.cpp",
+ "kms_aws.cpp",
+ "kms_local.cpp",
+ kmsEnv.Idlc("kms.idl")[0],
+ ],
+ LIBDEPS=[
+ '$BUILD_DIR/mongo/base/secure_allocator',
+ ],
+ LIBDEPS_PRIVATE=[
+ '$BUILD_DIR/mongo/base',
+ '$BUILD_DIR/mongo/crypto/aead_encryption',
+ '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
+ '$BUILD_DIR/mongo/util/net/network',
+ '$BUILD_DIR/mongo/util/net/ssl_manager',
+ '$BUILD_DIR/mongo/util/net/ssl_options',
+ '$BUILD_DIR/third_party/shim_kms_message',
+ ],
+ )
-env.Library(
- target="kms_shell",
- source=[
- "kms_shell.cpp",
- ],
- LIBDEPS_PRIVATE=[
- 'kms',
- 'shell_utils',
- ],
-)
+ env.Library(
+ target="kms_shell",
+ source=[
+ "kms_shell.cpp",
+ ],
+ LIBDEPS_PRIVATE=[
+ 'kms',
+ 'shell_utils',
+ ],
+ )
-scriptingEnv = env.Clone()
-scriptingEnv.InjectMozJS()
+ scriptingEnv = env.Clone()
+ scriptingEnv.InjectMozJS()
-scriptingEnv.Library(
- target="encrypted_dbclient",
- source=[
- "encrypted_dbclient_base.cpp",
- scriptingEnv.Idlc("fle_shell_options.idl")[0],
- ],
- LIBDEPS_PRIVATE=[
- '$BUILD_DIR/mongo/client/clientdriver_minimal',
- '$BUILD_DIR/mongo/crypto/aead_encryption',
- '$BUILD_DIR/mongo/crypto/symmetric_crypto',
- '$BUILD_DIR/mongo/scripting/scripting',
- '$BUILD_DIR/mongo/shell/shell_options_register',
- '$BUILD_DIR/third_party/shim_mozjs',
- 'kms',
- ],
-)
+ scriptingEnv.Library(
+ target="encrypted_dbclient",
+ source=[
+ "encrypted_dbclient_base.cpp",
+ scriptingEnv.Idlc("fle_shell_options.idl")[0],
+ ],
+ LIBDEPS_PRIVATE=[
+ '$BUILD_DIR/mongo/client/clientdriver_minimal',
+ '$BUILD_DIR/mongo/crypto/aead_encryption',
+ '$BUILD_DIR/mongo/crypto/symmetric_crypto',
+ '$BUILD_DIR/mongo/scripting/scripting',
+ '$BUILD_DIR/mongo/shell/shell_options_register',
+ '$BUILD_DIR/third_party/shim_mozjs',
+ 'kms',
+ ],
+ )
env.Library(
target="linenoise_utf8",
View Lorry Controller Status