Merge pull request #6581 from Doxense/enable-windows-encryption

Enable encryption for Windows
2022-03-11 11:31:34 +01:00 · 2022-03-11 11:31:34 +01:00 · dc5b129d10
parent 944ec48415 9e81945301
commit dc5b129d10
3 changed files with 3 additions and 3 deletions
--- a/fdbrpc/CMakeLists.txt
+++ b/fdbrpc/CMakeLists.txt
@ -36,7 +36,7 @@ set(FDBRPC_SRCS
  TraceFileIO.cpp
  TSSComparison.h)

-if(WITH_TLS AND NOT WIN32)
+if(WITH_TLS)
  set(FDBRPC_SRCS
    ${FDBRPC_SRCS}
    AsyncFileEncrypted.actor.cpp)
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@ -100,7 +100,7 @@ set(FLOW_SRCS
  xxhash.c
  xxhash.h)

-if(WITH_TLS AND NOT WIN32)
+if(WITH_TLS)
  set(FLOW_SRCS
    ${FLOW_SRCS}
    StreamCipher.cpp)
--- a/flow/StreamCipher.h
+++ b/flow/StreamCipher.h
@ -20,7 +20,7 @@

 #pragma once

-#if (!defined(TLS_DISABLED) && !defined(_WIN32))
+#if (!defined(TLS_DISABLED))
 #define ENCRYPTION_ENABLED 1
 #else
 #define ENCRYPTION_ENABLED 0