commit 36a107855b92d2c4cccb31081058b5fceb77c6ca parent 68680a239196e506e7f327091c87a45f2ad7408f Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 23 May 2018 09:08:57 -0400 Merge branch 'bug26156_034' Diffstat:
| A | changes/bug26156 | | | 3 | +++ |
| M | src/common/aes.c | | | 1 | + |
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/changes/bug26156 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 @@ -16,6 +16,7 @@ #include <ws2tcpip.h> #endif +#include "compat_openssl.h" #include <openssl/opensslv.h> #include "crypto_openssl_mgt.h"