diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-28 13:57:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-28 14:40:25 -0400 |
| commit | a742a826f6fe4eafef047c4dd7ca7fa899d2f823 (patch) | |
| tree | 7c83b2c177eeac4630736ed010266e6bcd36ebb3 /src/lib/crypt_ops/crypto_s2k.c | |
| parent | 0f02d2c0411448668d2dfe11b61e1ea72ee7a3b2 (diff) | |
| download | tor-a742a826f6fe4eafef047c4dd7ca7fa899d2f823.tar.gz tor-a742a826f6fe4eafef047c4dd7ca7fa899d2f823.zip | |
Remove all include common/ uses in crypto_ops and tls.
Diffstat (limited to 'src/lib/crypt_ops/crypto_s2k.c')
| -rw-r--r-- | src/lib/crypt_ops/crypto_s2k.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/crypt_ops/crypto_s2k.c b/src/lib/crypt_ops/crypto_s2k.c index 722407bf48..ab91d92f0e 100644 --- a/src/lib/crypt_ops/crypto_s2k.c +++ b/src/lib/crypt_ops/crypto_s2k.c @@ -12,14 +12,14 @@ #define CRYPTO_S2K_PRIVATE -#include "common/compat.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_s2k.h" #include "lib/crypt_ops/crypto_util.h" -#include "common/util.h" +#include "lib/ctime/di_ops.h" +#include "lib/log/util_bug.h" #include <openssl/evp.h> @@ -28,6 +28,8 @@ #include <libscrypt.h> #endif +#include <string.h> + /* Encoded secrets take the form: u8 type; @@ -473,4 +475,3 @@ secret_to_key_check(const uint8_t *spec_and_key, size_t spec_and_key_len, memwipe(buf, 0, sizeof(buf)); return rv; } - |