summaryrefslogtreecommitdiff
path: root/chacha_avx.cpp
diff options
context:
space:
mode:
authorchausner <15180557+chausner@users.noreply.github.com>2022-07-29 17:44:53 +0200
committerGitHub <noreply@github.com>2022-07-29 11:44:53 -0400
commitbc4a1b5330e3026c126198ea3ace438e33cced4a (patch)
tree6c27cc3e0fdb8765dc9ba5bc27b48fff8e766326 /chacha_avx.cpp
parente59577b49e2b8221dc5b09bfbd210e83ae4d80c1 (diff)
downloadcryptopp-git-bc4a1b5330e3026c126198ea3ace438e33cced4a.tar.gz
Enable MSVC global optimizations for AES and ChaCha for newer MSVC versions (GH #1131)
Diffstat (limited to 'chacha_avx.cpp')
-rw-r--r--chacha_avx.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/chacha_avx.cpp b/chacha_avx.cpp
index 8bd8ddc2..1c6c4d2d 100644
--- a/chacha_avx.cpp
+++ b/chacha_avx.cpp
@@ -36,13 +36,12 @@ extern const char CHACHA_AVX_FNAME[] = __FILE__;
# define MAYBE_CONST const
#endif
-// VS2017 and global optimization bug. TODO, figure out when
-// we can re-enable full optimizations for VS2017. Also see
+// VS2017 and global optimization bug. Also see
// https://github.com/weidai11/cryptopp/issues/649 and
// https://github.com/weidai11/cryptopp/issues/735. The
// 649 issue affects AES but it is the same here. The 735
// issue is ChaCha AVX2 cut-in where it surfaced again.
-#if (_MSC_VER >= 1910)
+#if (_MSC_VER >= 1910) && (_MSC_VER < 1916)
# ifndef CRYPTOPP_DEBUG
# pragma optimize("", off)
# pragma optimize("ts", on)