diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-23 09:08:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-23 09:08:57 -0400 |
| commit | 36a107855b92d2c4cccb31081058b5fceb77c6ca (patch) | |
| tree | d812024df91afcb9f69cda5672e98e2bebb0091c | |
| parent | 68680a239196e506e7f327091c87a45f2ad7408f (diff) | |
| parent | 48d752407b656652c5bdd96c0a839cb291adfc74 (diff) | |
| download | tor-36a107855b92d2c4cccb31081058b5fceb77c6ca.tar.gz tor-36a107855b92d2c4cccb31081058b5fceb77c6ca.zip | |
Merge branch 'bug26156_034'
| -rw-r--r-- | changes/bug26156 | 3 | ||||
| -rw-r--r-- | src/common/aes.c | 1 |
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" |