Merge remote-tracking branch 'public/feature15053'

src/common/crypto.c

@@ -51,9 +51,9 @@
 
 #define CRYPTO_PRIVATE
 #include "crypto.h"
-#include "../common/torlog.h"
+#include "torlog.h"
 #include "aes.h"
-#include "../common/util.h"
+#include "util.h"
 #include "container.h"
 #include "compat.h"
 #include "sandbox.h"

src/common/include.am

@@ -11,9 +11,7 @@ noinst_LIBRARIES += \
 	src/common/libor-event-testing.a
 endif
 
-EXTRA_DIST+= \
-  src/common/common_sha1.i	\
-  src/common/Makefile.nmake
+EXTRA_DIST += src/common/Makefile.nmake
 
 #CFLAGS  = -Wall -Wpointer-arith -O2
 AM_CPPFLAGS += -I$(srcdir)/src/common -Isrc/common -I$(srcdir)/src/ext/trunnel -I$(srcdir)/src/trunnel
@@ -135,7 +133,7 @@ COMMONHEADERS = \
 
 noinst_HEADERS+= $(COMMONHEADERS)
 
-DISTCLEANFILES+= src/common/common_sha1.i
+CLEANFILES+= src/common/common_sha1.i
 
 src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEADERS)
 	$(AM_V_GEN)if test "@SHA1SUM@" != none; then \

src/common/tortls.c

@@ -789,7 +789,7 @@ 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 "ciphers.inc"
   /* Tell it not to use SSLv2 ciphers, so that it can select an SSLv3 version
    * of any cipher we say. */
   "!SSLv2"
@@ -804,7 +804,7 @@ typedef struct cipher_info_t { unsigned id; const char *name; } cipher_info_t;
 static const cipher_info_t CLIENT_CIPHER_INFO_LIST[] = {
 #define CIPHER(id, name) { id, name },
 #define XCIPHER(id, name) { id, #name },
-#include "./ciphers.inc"
+#include "ciphers.inc"
 #undef CIPHER
 #undef XCIPHER
 };