aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2019-11-10 12:16:46 -0500
committerJack Lloyd <[email protected]>2019-11-10 12:16:46 -0500
commit371c4cb3708fcf0731ee3e2bfc44eefdde1f0696 (patch)
treee21e41d19af739c9d8058a1c4f4243491f54e4de
parentf97cd509e65e6beeb5c9301a31cc419b2a6a8cef (diff)
parent548b73ab115fb473d2a62a8e589c197eac0b6b08 (diff)
Merge GH #2189 CLI encryption doesn't need AES if ChaCha20 is avilable
-rw-r--r--src/cli/encryption.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cli/encryption.cpp b/src/cli/encryption.cpp
index 444877db5..4d85890b0 100644
--- a/src/cli/encryption.cpp
+++ b/src/cli/encryption.cpp
@@ -6,7 +6,7 @@
#include "cli.h"
-#if defined(BOTAN_HAS_AES) && defined(BOTAN_HAS_AEAD_MODES)
+#if (defined(BOTAN_HAS_AES) || defined(BOTAN_HAS_AEAD_CHACHA20_POLY1305)) && defined(BOTAN_HAS_AEAD_MODES)
#include <botan/aead.h>
#include <botan/hex.h>