summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-07-31 11:21:34 -0400
committerNick Mathewson <nickm@torproject.org>2015-07-31 11:21:34 -0400
commit347fe449fe818f97e0f3ba29dd0a08ff6d39081e (patch)
tree9397c155e38a7e7084b91c55f1c57f576aa42b25 /src/or
parent8c83e8cec0e8d4c29577ae7c7b27637e5b91c99e (diff)
downloadtor-347fe449fe818f97e0f3ba29dd0a08ff6d39081e.tar.gz
tor-347fe449fe818f97e0f3ba29dd0a08ff6d39081e.zip
Move formatting functions around.
The base64 and base32 functions used to be in crypto.c; crypto_format.h had no header; some general-purpose functions were in crypto_curve25519.c. This patch makes a {crypto,util}_format.[ch], and puts more functions there. Small modules are beautiful!
Diffstat (limited to 'src/or')
-rw-r--r--src/or/keypin.c2
-rw-r--r--src/or/or.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/or/keypin.c b/src/or/keypin.c
index a5b4cf75f9..ebe83b35d2 100644
--- a/src/or/keypin.c
+++ b/src/or/keypin.c
@@ -6,6 +6,7 @@
#include "orconfig.h"
#include "compat.h"
#include "crypto.h"
+#include "crypto_format.h"
#include "di_ops.h"
#include "ht.h"
#include "keypin.h"
@@ -13,6 +14,7 @@
#include "torint.h"
#include "torlog.h"
#include "util.h"
+#include "util_format.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/src/or/or.h b/src/or/or.h
index cbbfe9ddcd..f6aee13f5b 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -81,6 +81,7 @@
#endif
#include "crypto.h"
+#include "crypto_format.h"
#include "tortls.h"
#include "torlog.h"
#include "container.h"
@@ -92,6 +93,7 @@
#include "crypto_curve25519.h"
#include "crypto_ed25519.h"
#include "tor_queue.h"
+#include "util_format.h"
/* These signals are defined to help handle_control_signal work.
*/