install tr_dh.h

diff --git a/Makefile.am b/Makefile.am
index d8bd9b7..4f8730d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,10 +35,10 @@ libtr_tid_la_LIBADD = gsscon/libgsscon.la
 libtr_tid_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0 -no-undefined
 
 pkginclude_HEADERS = include/trust_router/tid.h include/trust_router/tr_name.h \
+       include/trust_router/tr_dh.h \
 include/trust_router/tr_versioning.h
 
 noinst_HEADERS = include/gsscon.h include/tr_config.h \
 include/tr_msg.h \
-include/tr.h \
-include/tr_dh.h
+include/tr.h
 

diff --git a/common/dh_test/dh_test.c b/common/dh_test/dh_test.c
index 875207b..342099d 100644 (file)
--- a/common/dh_test/dh_test.c
+++ b/common/dh_test/dh_test.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <tr_dh.h>
+#include <trust_router/tr_dh.h>
 
 // char tmp_key1[32] = 
 //  {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 

diff --git a/common/tr_dh.c b/common/tr_dh.c
index f32c613..6bda6ee 100644 (file)
--- a/common/tr_dh.c
+++ b/common/tr_dh.c
@@ -33,7 +33,7 @@
  */
 
 #include <openssl/dh.h>
-#include <tr_dh.h>
+#include <trust_router/tr_dh.h>
 
 unsigned char tr_2048_dhprime[2048/8] = {
   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,

diff --git a/common/tr_util.c b/common/tr_util.c
index 06b7d8a..55cebeb 100644 (file)
--- a/common/tr_util.c
+++ b/common/tr_util.c
@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <tr_dh.h>
+#include <trust_router/tr_dh.h>
 
 void tr_bin_to_hex(const unsigned char * bin, size_t bin_len,
                   char * hex_out, size_t hex_len)

diff --git a/include/tr_dh.h b/include/trust_router/tr_dh.h
similarity index 100%
rename from include/tr_dh.h
rename to include/trust_router/tr_dh.h

diff --git a/tid/example/tids_main.c b/tid/example/tids_main.c
index dbd56ea..06a2831 100644 (file)
--- a/tid/example/tids_main.c
+++ b/tid/example/tids_main.c
@@ -38,7 +38,7 @@
 #include <sqlite3.h>
 
 #include <trust_router/tid.h>
-#include <tr_dh.h>
+#include <trust_router/tr_dh.h>
 #include <openssl/rand.h>
 
 static sqlite3 *db = NULL;

diff --git a/tid/tidc.c b/tid/tidc.c
index 19ff353..b36ce6f 100644 (file)
--- a/tid/tidc.c
+++ b/tid/tidc.c
@@ -37,7 +37,7 @@
 #include <jansson.h>
 
 #include <gsscon.h>
-#include <tr_dh.h>
+#include <trust_router/tr_dh.h>
 #include <trust_router/tid.h>
 #include <tr_msg.h>
 #include <gsscon.h>