Skip to content
Snippets Groups Projects
Commit 932b4d0a authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Remove container->crypto dependency

Containers were using crypto_digest.h, just to see the value of
DIGEST_LEN.  Moved those constants into a new defs module.
parent 479c2ab5
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,7 @@ include src/lib/ctime/include.am
include src/lib/compress/include.am
include src/lib/container/include.am
include src/lib/crypt_ops/include.am
include src/lib/defs/include.am
include src/lib/include.libdonna.am
include src/lib/malloc/include.am
include src/lib/testsupport/include.am
......
......@@ -13,7 +13,7 @@
#include "lib/container/map.h"
#include "lib/ctime/di_ops.h"
#include "lib/crypt_ops/crypto_digest.h"
#include "lib/defs/digest_sizes.h"
#include "common/util_bug.h"
#include "common/util.h" // For strlower
......
......@@ -15,7 +15,7 @@
#include "lib/container/smartlist.h"
#include "lib/err/torerr.h"
#include "common/util.h" // For strstrip.
#include "lib/crypt_ops/crypto_digest.h"
#include "lib/defs/digest_sizes.h"
#include "lib/ctime/di_ops.h"
#include <stdlib.h>
......
......@@ -2,6 +2,7 @@ orconfig.h
lib/cc/*.h
lib/crypt_ops/*.h
lib/ctime/*.h
lib/defs/*.h
lib/err/*.h
lib/testsupport/testsupport.h
......
......@@ -580,4 +580,3 @@ crypto_xof_free_(crypto_xof_t *xof)
memwipe(xof, 0, sizeof(crypto_xof_t));
tor_free(xof);
}
......@@ -17,14 +17,7 @@
#include "lib/container/container.h"
#include "lib/cc/torint.h"
/** Length of the output of our message digest. */
#define DIGEST_LEN 20
/** Length of the output of our second (improved) message digests. (For now
* this is just sha256, but it could be any other 256-bit digest.) */
#define DIGEST256_LEN 32
/** Length of the output of our 64-bit optimized message digests (SHA512). */
#define DIGEST512_LEN 64
#include "lib/defs/digest_sizes.h"
/** Length of a sha1 message digest when encoded in base32 with trailing =
* signs removed. */
......@@ -133,4 +126,3 @@ digest_algorithm_t crypto_digest_get_algorithm(crypto_digest_t *digest);
#endif
#endif /* !defined(TOR_CRYPTO_DIGEST_H) */
orconfig.h
/* Copyright (c) 2001, Matej Pfajfar.
* Copyright (c) 2001-2004, Roger Dingledine.
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
* Copyright (c) 2007-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#ifndef TOR_DIGEST_SIZES_H
#define TOR_DIGEST_SIZES_H
/** Length of the output of our message digest. */
#define DIGEST_LEN 20
/** Length of the output of our second (improved) message digests. (For now
* this is just sha256, but it could be any other 256-bit digest.) */
#define DIGEST256_LEN 32
/** Length of the output of our 64-bit optimized message digests (SHA512). */
#define DIGEST512_LEN 64
#endif
noinst_HEADERS += \
digest_sizes.h
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment