aboutsummaryrefslogtreecommitdiff
path: root/src/lib/tls
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-06 20:27:43 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-14 16:07:35 -0500
commite429e31ad1c3000d814f3172fcd3f7c433ee3219 (patch)
tree9bcd3f344b7cb4e2e6e38155f5a51e70ac497ae8 /src/lib/tls
parentc0a7527eb8590b39f11dd8b0ae18794dfc63a934 (diff)
downloadtor-e429e31ad1c3000d814f3172fcd3f7c433ee3219.tar.gz
tor-e429e31ad1c3000d814f3172fcd3f7c433ee3219.zip
Normalize .may_include to always have paths, and paths to include
Diffstat (limited to 'src/lib/tls')
-rw-r--r--src/lib/tls/.may_include5
-rw-r--r--src/lib/tls/tortls_openssl.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/tls/.may_include b/src/lib/tls/.may_include
index 069181b70e..c550bde024 100644
--- a/src/lib/tls/.may_include
+++ b/src/lib/tls/.may_include
@@ -13,7 +13,6 @@ lib/malloc/*.h
lib/net/*.h
lib/string/*.h
lib/subsys/*.h
-lib/testsupport/testsupport.h
+lib/testsupport/*.h
lib/tls/*.h
-
-ciphers.inc
+lib/tls/*.inc
diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c
index 63f6259a6c..ddeaabc416 100644
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@ -461,7 +461,7 @@ static const char UNRESTRICTED_SERVER_CIPHER_LIST[] =
/** List of ciphers that clients should advertise, omitting items that
* our OpenSSL doesn't know about. */
static const char CLIENT_CIPHER_LIST[] =
-#include "ciphers.inc"
+#include "lib/tls/ciphers.inc"
/* Tell it not to use SSLv2 ciphers, so that it can select an SSLv3 version
* of any cipher we say. */
"!SSLv2"