diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-26 19:52:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-26 20:12:59 -0400 |
| commit | 0eed0899cdeadd84dc5323f8ca0a3a13cd3779de (patch) | |
| tree | 78078494701e80ecb461dd01b173cb51da9c4977 /src/common/tortls.c | |
| parent | d96dc2060a0470a4607db6f2991ea7c2c3508e23 (diff) | |
| parent | 7759ac8df2944aa58fff4152dd2c4c521f78ef10 (diff) | |
| download | tor-0eed0899cdeadd84dc5323f8ca0a3a13cd3779de.tar.gz tor-0eed0899cdeadd84dc5323f8ca0a3a13cd3779de.zip | |
Merge branch 'bug24658-rm-curve25519-header' into bug24658-merge
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 50609b8ac7..05e29e22ff 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -25,6 +25,7 @@ #include <ws2tcpip.h> #endif +#include "crypto.h" #include "compat.h" /* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in @@ -32,7 +33,6 @@ DISABLE_GCC_WARNING(redundant-decls) #include <openssl/opensslv.h> -#include "crypto.h" #ifdef OPENSSL_NO_EC #error "We require OpenSSL with ECC support" |