routing/kademlia, using sha256 instead of sha1.
This commit is contained in:
parent
ccc7ca3e8b
commit
35a9b4b73e
1 changed files with 22 additions and 14 deletions
|
@ -13,7 +13,7 @@
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <sys/signal.h>
|
#include <sys/signal.h>
|
||||||
#include <libp2p/crypto/sha1.h>
|
#include <libp2p/crypto/sha256.h>
|
||||||
#include <dht.h>
|
#include <dht.h>
|
||||||
|
|
||||||
#define MAX_BOOTSTRAP_NODES 20
|
#define MAX_BOOTSTRAP_NODES 20
|
||||||
|
@ -51,26 +51,34 @@ int dht_blacklisted (const struct sockaddr *sa, int salen)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We need to provide a reasonably strong cryptographic hashing function.
|
/* We need to provide a reasonably strong cryptographic hashing function.
|
||||||
SHA-1 code adapted from https://github.com/mwarning/KadNode */
|
libp2p_crypto_hashing_sha256 */
|
||||||
void dht_hash (void *hash_return, int hash_size,
|
void dht_hash (void *hash_return, int hash_size,
|
||||||
const void *v1, int len1,
|
const void *v1, int len1,
|
||||||
const void *v2, int len2,
|
const void *v2, int len2,
|
||||||
const void *v3, int len3)
|
const void *v3, int len3)
|
||||||
{
|
{
|
||||||
SHA1_CTX ctx;
|
int len = len1 + len2 + len3;
|
||||||
uint8_t digest[SHA1_DIGEST_SIZE];
|
char *in, out[32];
|
||||||
|
|
||||||
SHA1_Init (&ctx);
|
if (!hash_return || hash_size==0 || len==0) {
|
||||||
if (v1) SHA1_Update (&ctx, v1, len1);
|
return; // invalid param.
|
||||||
if (v2) SHA1_Update (&ctx, v2, len2);
|
}
|
||||||
if (v3) SHA1_Update (&ctx, v3, len3);
|
|
||||||
SHA1_Final (&ctx, digest);
|
in = malloc (len);
|
||||||
|
|
||||||
if (hash_size > SHA1_DIGEST_SIZE) {
|
if (in) {
|
||||||
memset ((char*)hash_return + SHA1_DIGEST_SIZE, 0, hash_size - SHA1_DIGEST_SIZE);
|
memcpy(in, v1, len1);
|
||||||
hash_size = SHA1_DIGEST_SIZE;
|
memcpy(in+len1, v2, len2);
|
||||||
|
memcpy(in+len1+len2, v3, len3);
|
||||||
|
if ( libp2p_crypto_hashing_sha256 (in, len, out) ) {
|
||||||
|
if (hash_size > sizeof(out)) {
|
||||||
|
memset ((char*)hash_return + sizeof(out), 0, hash_size - sizeof(out));
|
||||||
|
hash_size = sizeof(out);
|
||||||
|
}
|
||||||
|
memcpy(hash_return, out, hash_size);
|
||||||
|
}
|
||||||
|
free (in);
|
||||||
}
|
}
|
||||||
memcpy(hash_return, digest, hash_size);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int dht_random_bytes (void *buf, size_t size)
|
int dht_random_bytes (void *buf, size_t size)
|
||||||
|
|
Loading…
Reference in a new issue