From f71e97511b7367303164dac979f3a304a3fb76b1 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 18 May 2021 20:48:16 +0000 Subject: [PATCH] set use_ssl flag --- src/Disks/DiskEncrypted.cpp | 10 +++++++++- src/Disks/DiskEncrypted.h | 5 +++++ src/Disks/registerDisks.cpp | 4 ++++ src/Functions/FileEncryption.h | 5 ++++- src/IO/ReadEncryptedBuffer.h | 5 +++++ src/IO/WriteEncryptedBuffer.h | 5 +++++ 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/Disks/DiskEncrypted.cpp b/src/Disks/DiskEncrypted.cpp index 9c541e93b1e..657a5315f1e 100644 --- a/src/Disks/DiskEncrypted.cpp +++ b/src/Disks/DiskEncrypted.cpp @@ -1,4 +1,9 @@ -#include +#if !defined(ARCADIA_BUILD) +# include +#endif + +#if USE_SSL + #include #include "Disks/DiskFactory.h" @@ -179,3 +184,6 @@ void registerDiskEncrypted(DiskFactory & factory) } } + + +#endif diff --git a/src/Disks/DiskEncrypted.h b/src/Disks/DiskEncrypted.h index a5fcf858d21..16305662c15 100644 --- a/src/Disks/DiskEncrypted.h +++ b/src/Disks/DiskEncrypted.h @@ -1,5 +1,7 @@ #pragma once +#if USE_SSL + #include #include #include @@ -242,3 +244,6 @@ private: }; } + + +#endif diff --git a/src/Disks/registerDisks.cpp b/src/Disks/registerDisks.cpp index c2309013046..a6f5104bd3b 100644 --- a/src/Disks/registerDisks.cpp +++ b/src/Disks/registerDisks.cpp @@ -13,7 +13,9 @@ void registerDiskMemory(DiskFactory & factory); #if USE_AWS_S3 void registerDiskS3(DiskFactory & factory); #endif +#if USE_SSL void registerDiskEncrypted(DiskFactory & factory); +#endif void registerDisks() { @@ -24,7 +26,9 @@ void registerDisks() #if USE_AWS_S3 registerDiskS3(factory); #endif +#if USE_SSL registerDiskEncrypted(factory); +#endif } } diff --git a/src/Functions/FileEncryption.h b/src/Functions/FileEncryption.h index b8b73e094f6..6c0e5d8f549 100644 --- a/src/Functions/FileEncryption.h +++ b/src/Functions/FileEncryption.h @@ -1,6 +1,6 @@ #pragma once -#include +#if USE_SSL #include #include @@ -326,3 +326,6 @@ private: }; } + + +#endif diff --git a/src/IO/ReadEncryptedBuffer.h b/src/IO/ReadEncryptedBuffer.h index b5f084a7c93..d3dba0cd618 100644 --- a/src/IO/ReadEncryptedBuffer.h +++ b/src/IO/ReadEncryptedBuffer.h @@ -1,5 +1,7 @@ #pragma once +#if USE_SSL + #include #include #include @@ -116,3 +118,6 @@ private: }; } + + +#endif diff --git a/src/IO/WriteEncryptedBuffer.h b/src/IO/WriteEncryptedBuffer.h index d5491f2f1f9..67fc204f56f 100644 --- a/src/IO/WriteEncryptedBuffer.h +++ b/src/IO/WriteEncryptedBuffer.h @@ -1,5 +1,7 @@ #pragma once +#if USE_SSL + #include #include @@ -78,3 +80,6 @@ private: }; } + + +#endif