summaryrefslogtreecommitdiff
path: root/src/trunnel/trunnel-local.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-24 10:51:39 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-25 11:58:14 -0400
commit3b7d0ed08e13d5b806b86818acec00c9352cf1c5 (patch)
treea4ca9a417606f09db1c6b4d62ebefe2331cd5875 /src/trunnel/trunnel-local.h
parent301114940143b0d950b3a8dd69e2d6ee0bc6244d (diff)
downloadtor-3b7d0ed08e13d5b806b86818acec00c9352cf1c5.tar.gz
tor-3b7d0ed08e13d5b806b86818acec00c9352cf1c5.zip
Use trunnel for crypto_pwbox encoding/decoding.
This reduces the likelihood that I have made any exploitable errors in the encoding/decoding. This commit also imports the trunnel runtime source into Tor.
Diffstat (limited to 'src/trunnel/trunnel-local.h')
-rw-r--r--src/trunnel/trunnel-local.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h
new file mode 100644
index 0000000000..b7c2ab98ef
--- /dev/null
+++ b/src/trunnel/trunnel-local.h
@@ -0,0 +1,18 @@
+
+#ifndef TRUNNEL_LOCAL_H_INCLUDED
+#define TRUNNEL_LOCAL_H_INCLUDED
+
+#include "util.h"
+#include "compat.h"
+#include "crypto.h"
+
+#define trunnel_malloc tor_malloc
+#define trunnel_calloc tor_calloc
+#define trunnel_strdup tor_strdup
+#define trunnel_free_ tor_free_
+#define trunnel_realloc tor_realloc
+#define trunnel_reallocarray tor_reallocarray
+#define trunnel_assert tor_assert
+#define trunnel_memwipe(mem, len) memwipe((mem), 0, (len))
+
+#endif