aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-22 10:05:27 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-22 10:05:27 -0400
commit48d752407b656652c5bdd96c0a839cb291adfc74 (patch)
treedff0b6dc6bc49678377b03cb459498a0a227ca8e
parentadd00045aa56c77b93b1fb4b3cf424588a7baf0e (diff)
downloadtor-48d752407b656652c5bdd96c0a839cb291adfc74.tar.gz
tor-48d752407b656652c5bdd96c0a839cb291adfc74.zip
Add a missing include to get the declaration of OPENSSL_1_1_API
Apparently, even though I had tested on OpenSSL 1.1.1 with no-deprecated, OpenSSL 1.1.0 is different enough that I should have tested with that as well. Fixes bug 26156; bugfix on 0.3.4.1-alpha where we first declared support for this configuration.
-rw-r--r--changes/bug261563
-rw-r--r--src/common/aes.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug26156 b/changes/bug26156
new file mode 100644
index 0000000000..dcb3ca6377
--- /dev/null
+++ b/changes/bug26156
@@ -0,0 +1,3 @@
+ o Minor bugfixes (compilation):
+ - Fix compilation when building with OpenSSL 1.1.0 with the
+ "no-deprecated" flag enabled. Fixes bug 26156; bugfix on 0.3.4.1-alpha.
diff --git a/src/common/aes.c b/src/common/aes.c
index f6b933374a..86f3472bfd 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -16,6 +16,7 @@
#include <ws2tcpip.h>
#endif
+#include "compat_openssl.h"
#include <openssl/opensslv.h>
#include "crypto_openssl_mgt.h"