diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-21 17:00:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-22 09:49:13 -0400 |
| commit | de508c5f50af855742b59579afd6c9c328eb7cd6 (patch) | |
| tree | 46f3e34bc7fca3a5909bf7abad202a53a1d451f4 /src/lib/crypt_ops | |
| parent | 9cf6fc91b1d0870dab8bf87feb9132e7e0de2808 (diff) | |
| download | tor-de508c5f50af855742b59579afd6c9c328eb7cd6.tar.gz tor-de508c5f50af855742b59579afd6c9c328eb7cd6.zip | |
Extract smartlist.h from container.h
Diffstat (limited to 'src/lib/crypt_ops')
| -rw-r--r-- | src/lib/crypt_ops/crypto_digest.c | 2 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_digest.h | 3 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_format.c | 3 | ||||
| -rw-r--r-- | src/lib/crypt_ops/crypto_rand.c | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c index b6ec2b2841..b1aede3a83 100644 --- a/src/lib/crypt_ops/crypto_digest.c +++ b/src/lib/crypt_ops/crypto_digest.c @@ -10,7 +10,7 @@ * operations. **/ -#include "lib/container/container.h" +#include "lib/container/smartlist.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_openssl_mgt.h" #include "lib/crypt_ops/crypto_util.h" diff --git a/src/lib/crypt_ops/crypto_digest.h b/src/lib/crypt_ops/crypto_digest.h index 628224a03f..15bc5ad5b9 100644 --- a/src/lib/crypt_ops/crypto_digest.h +++ b/src/lib/crypt_ops/crypto_digest.h @@ -13,7 +13,6 @@ #ifndef TOR_CRYPTO_DIGEST_H #define TOR_CRYPTO_DIGEST_H -#include "lib/container/container.h" #include "lib/cc/torint.h" #include "lib/defs/digest_sizes.h" #include "lib/malloc/util_malloc.h" @@ -70,6 +69,8 @@ typedef struct { typedef struct crypto_digest_t crypto_digest_t; typedef struct crypto_xof_t crypto_xof_t; +struct smartlist_t; + /* SHA-1 and other digests */ int crypto_digest(char *digest, const char *m, size_t len); int crypto_digest256(char *digest, const char *m, size_t len, diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c index 246f28716a..2d28090aaa 100644 --- a/src/lib/crypt_ops/crypto_format.c +++ b/src/lib/crypt_ops/crypto_format.c @@ -14,7 +14,7 @@ #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif -#include "lib/container/container.h" +#include "lib/container/smartlist.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_ed25519.h" @@ -296,4 +296,3 @@ digest256_from_base64(char *digest, const char *d64) else return -1; } - diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index af258abea4..0d41a207e8 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -21,7 +21,7 @@ #include <wincrypt.h> #endif /* defined(_WIN32) */ -#include "lib/container/container.h" +#include "lib/container/smartlist.h" #include "common/compat.h" #include "lib/crypt_ops/compat_openssl.h" #include "lib/crypt_ops/crypto_util.h" @@ -612,4 +612,3 @@ crypto_force_rand_ssleay(void) } #endif /* !defined(CRYPTO_RAND_PRIVATE) */ - |