From e111cfcd54662bd6cea86e7a970492b3b80bd723 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 12 Jul 2017 09:19:12 -0400 Subject: Restore openssl and libscrypt includes in test_crypto_slow.c This reverts part of commit 706c44a6ce0bbeee51c800521a3199d76e1dcd96. It was a mistake to remove these includes: they were needed on systems where we have openssl 1.1.0 *and* libscrypt, and where we were validating the one against the other. Fixes bug 22892; bugfix on 0.3.1.1-alpha. --- changes/bug22892 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/bug22892 (limited to 'changes') diff --git a/changes/bug22892 b/changes/bug22892 new file mode 100644 index 0000000000..9a70cb0576 --- /dev/null +++ b/changes/bug22892 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Compile correctly when both openssl 1.1.0 and libscrypt are detected. + Previously this would cause an error. Fixes bug 22892; bugfix on + 0.3.1.1-alpha. -- cgit v1.2.3-54-g00ecf