diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-27 15:59:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-27 16:18:42 -0400 |
| commit | 235ddb15a0f9fc322002ba39e8900634316dc333 (patch) | |
| tree | 8b18c9ff270a8f2413cab4fa9408b60dade0baf0 /src/lib/crypt_ops | |
| parent | 3cff3e825a1478fc3350bbca16f091b8f635f921 (diff) | |
| download | tor-235ddb15a0f9fc322002ba39e8900634316dc333.tar.gz tor-235ddb15a0f9fc322002ba39e8900634316dc333.zip | |
Move util_format into a new libtor-encoding library
libtor-encoding is about various ways to transform data to and from
character sequences.
Diffstat (limited to 'src/lib/crypt_ops')
| -rw-r--r-- | src/lib/crypt_ops/.may_include | 1 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto.c | 2 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_ed25519.c | 2 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_format.c | 2 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_rand.c | 2 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_rsa.c | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/crypt_ops/.may_include b/src/lib/crypt_ops/.may_include index d05e86f720..dad6d5fc6a 100644 --- a/src/lib/crypt_ops/.may_include +++ b/src/lib/crypt_ops/.may_include @@ -4,6 +4,7 @@ lib/container/*.h lib/crypt_ops/*.h lib/ctime/*.h lib/defs/*.h +lib/encoding/*.h lib/malloc/*.h lib/err/*.h lib/intmath/*.h diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c index 1935803979..efd355928f 100644 --- a/src/lib/crypt_ops/crypto.c +++ b/src/lib/crypt_ops/crypto.c @@ -67,7 +67,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "lib/crypt_ops/aes.h" #include "common/util.h" #include "common/compat.h" -#include "common/util_format.h" +#include "lib/encoding/binascii.h" #include "keccak-tiny/keccak-tiny.h" diff --git a/src/lib/crypt_ops/crypto_ed25519.c b/src/lib/crypt_ops/crypto_ed25519.c index 5655fbf508..b0e23e29c6 100644 --- a/src/lib/crypt_ops/crypto_ed25519.c +++ b/src/lib/crypt_ops/crypto_ed25519.c @@ -29,7 +29,7 @@ #include "lib/crypt_ops/crypto_util.h" #include "lib/log/torlog.h" #include "common/util.h" -#include "common/util_format.h" +#include "lib/encoding/binascii.h" #include "ed25519/ref10/ed25519_ref10.h" #include "ed25519/donna/ed25519_donna_tor.h" diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 888c0794ec..131aa449e0 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -22,7 +22,7 @@ #include "lib/crypt_ops/crypto_util.h" #include "lib/string/util_string.h" #include "common/util.h" -#include "common/util_format.h" +#include "lib/encoding/binascii.h" #include "lib/log/torlog.h" /** Write the <b>datalen</b> bytes from <b>data</b> to the file named diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index bf6a35ddbc..247a502241 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -29,7 +29,7 @@ #include "lib/testsupport/testsupport.h" #include "lib/log/torlog.h" #include "common/util.h" -#include "common/util_format.h" +#include "lib/encoding/binascii.h" DISABLE_GCC_WARNING(redundant-decls) #include <openssl/rand.h> diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 3f2f8544f7..a62c0018f9 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -35,7 +35,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "lib/log/torlog.h" #include "common/util.h" -#include "common/util_format.h" +#include "lib/encoding/binascii.h" /** Declaration for crypto_pk_t structure. */ struct crypto_pk_t |