projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merging configs
[oweals/gnunet.git]
/
src
/
util
/
crypto_hash.c
diff --git
a/src/util/crypto_hash.c
b/src/util/crypto_hash.c
index 9f8c4b9cfb13a0b30c99403056c7bc53a0a61176..04225b3dce98559846fdf3fa4217e119c8c49109 100644
(file)
--- a/
src/util/crypto_hash.c
+++ b/
src/util/crypto_hash.c
@@
-49,7
+49,7
@@
* @param ret pointer to where to write the hashcode
*/
void
* @param ret pointer to where to write the hashcode
*/
void
-GNUNET_CRYPTO_hash (const void *block, size_t size, GNUNET_HashCode * ret)
+GNUNET_CRYPTO_hash (const void *block, size_t size,
struct
GNUNET_HashCode * ret)
{
gcry_md_hash_buffer (GCRY_MD_SHA512, ret, block, size);
}
{
gcry_md_hash_buffer (GCRY_MD_SHA512, ret, block, size);
}
@@
-140,7
+140,7
@@
struct GNUNET_CRYPTO_FileHashContext
*/
static void
file_hash_finish (struct GNUNET_CRYPTO_FileHashContext *fhc,
*/
static void
file_hash_finish (struct GNUNET_CRYPTO_FileHashContext *fhc,
- const GNUNET_HashCode * res)
+ const
struct
GNUNET_HashCode * res)
{
fhc->callback (fhc->callback_cls, res);
GNUNET_free (fhc->filename);
{
fhc->callback (fhc->callback_cls, res);
GNUNET_free (fhc->filename);
@@
-161,7
+161,7
@@
static void
file_hash_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_CRYPTO_FileHashContext *fhc = cls;
file_hash_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_CRYPTO_FileHashContext *fhc = cls;
- GNUNET_HashCode *res;
+
struct
GNUNET_HashCode *res;
size_t delta;
fhc->task = GNUNET_SCHEDULER_NO_TASK;
size_t delta;
fhc->task = GNUNET_SCHEDULER_NO_TASK;
@@
-179,7
+179,7
@@
file_hash_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
fhc->offset += delta;
if (fhc->offset == fhc->fsize)
{
fhc->offset += delta;
if (fhc->offset == fhc->fsize)
{
- res = (GNUNET_HashCode *) gcry_md_read (fhc->md, GCRY_MD_SHA512);
+ res = (
struct
GNUNET_HashCode *) gcry_md_read (fhc->md, GCRY_MD_SHA512);
file_hash_finish (fhc, res);
return;
}
file_hash_finish (fhc, res);
return;
}
@@
-272,7
+272,7
@@
GNUNET_CRYPTO_hash_file_cancel (struct GNUNET_CRYPTO_FileHashContext *fhc)
* safely cast to char*, a '\\0' termination is set).
*/
void
* safely cast to char*, a '\\0' termination is set).
*/
void
-GNUNET_CRYPTO_hash_to_enc (const GNUNET_HashCode * block,
+GNUNET_CRYPTO_hash_to_enc (const
struct
GNUNET_HashCode * block,
struct GNUNET_CRYPTO_HashAsciiEncoded *result)
{
char *np;
struct GNUNET_CRYPTO_HashAsciiEncoded *result)
{
char *np;
@@
-296,9
+296,14
@@
GNUNET_CRYPTO_hash_to_enc (const GNUNET_HashCode * block,
*/
int
GNUNET_CRYPTO_hash_from_string2 (const char *enc, size_t enclen,
*/
int
GNUNET_CRYPTO_hash_from_string2 (const char *enc, size_t enclen,
- GNUNET_HashCode * result)
+
struct
GNUNET_HashCode * result)
{
{
- return GNUNET_STRINGS_string_to_data (enc, enclen,
+ char upper_enc[enclen];
+ char* up_ptr = upper_enc;
+
+ GNUNET_STRINGS_utf8_toupper(enc, &up_ptr);
+
+ return GNUNET_STRINGS_string_to_data (upper_enc, enclen,
(unsigned char*) result,
sizeof (struct GNUNET_HashCode));
}
(unsigned char*) result,
sizeof (struct GNUNET_HashCode));
}
@@
-316,8
+321,8
@@
GNUNET_CRYPTO_hash_from_string2 (const char *enc, size_t enclen,
* hashcode proximity.
*/
unsigned int
* hashcode proximity.
*/
unsigned int
-GNUNET_CRYPTO_hash_distance_u32 (const GNUNET_HashCode * a,
- const GNUNET_HashCode * b)
+GNUNET_CRYPTO_hash_distance_u32 (const
struct
GNUNET_HashCode * a,
+ const
struct
GNUNET_HashCode * b)
{
unsigned int x1 = (a->bits[1] - b->bits[1]) >> 16;
unsigned int x2 = (b->bits[1] - a->bits[1]) >> 16;
{
unsigned int x1 = (a->bits[1] - b->bits[1]) >> 16;
unsigned int x2 = (b->bits[1] - a->bits[1]) >> 16;
@@
-334,11
+339,11
@@
GNUNET_CRYPTO_hash_distance_u32 (const GNUNET_HashCode * a,
*/
void
GNUNET_CRYPTO_hash_create_random (enum GNUNET_CRYPTO_Quality mode,
*/
void
GNUNET_CRYPTO_hash_create_random (enum GNUNET_CRYPTO_Quality mode,
- GNUNET_HashCode * result)
+
struct
GNUNET_HashCode * result)
{
int i;
{
int i;
- for (i = (sizeof (GNUNET_HashCode) / sizeof (uint32_t)) - 1; i >= 0; i--)
+ for (i = (sizeof (
struct
GNUNET_HashCode) / sizeof (uint32_t)) - 1; i >= 0; i--)
result->bits[i] = GNUNET_CRYPTO_random_u32 (mode, UINT32_MAX);
}
result->bits[i] = GNUNET_CRYPTO_random_u32 (mode, UINT32_MAX);
}
@@
-351,13
+356,13
@@
GNUNET_CRYPTO_hash_create_random (enum GNUNET_CRYPTO_Quality mode,
* @param result set to b - a
*/
void
* @param result set to b - a
*/
void
-GNUNET_CRYPTO_hash_difference (const GNUNET_HashCode * a,
- const GNUNET_HashCode * b,
- GNUNET_HashCode * result)
+GNUNET_CRYPTO_hash_difference (const
struct
GNUNET_HashCode * a,
+ const
struct
GNUNET_HashCode * b,
+
struct
GNUNET_HashCode * result)
{
int i;
{
int i;
- for (i = (sizeof (GNUNET_HashCode) / sizeof (unsigned int)) - 1; i >= 0; i--)
+ for (i = (sizeof (
struct
GNUNET_HashCode) / sizeof (unsigned int)) - 1; i >= 0; i--)
result->bits[i] = b->bits[i] - a->bits[i];
}
result->bits[i] = b->bits[i] - a->bits[i];
}
@@
-370,12
+375,12
@@
GNUNET_CRYPTO_hash_difference (const GNUNET_HashCode * a,
* @param result set to a + delta
*/
void
* @param result set to a + delta
*/
void
-GNUNET_CRYPTO_hash_sum (const GNUNET_HashCode * a,
- const
GNUNET_HashCode * delta,
GNUNET_HashCode * result)
+GNUNET_CRYPTO_hash_sum (const
struct
GNUNET_HashCode * a,
+ const
struct GNUNET_HashCode * delta, struct
GNUNET_HashCode * result)
{
int i;
{
int i;
- for (i = (sizeof (GNUNET_HashCode) / sizeof (unsigned int)) - 1; i >= 0; i--)
+ for (i = (sizeof (
struct
GNUNET_HashCode) / sizeof (unsigned int)) - 1; i >= 0; i--)
result->bits[i] = delta->bits[i] + a->bits[i];
}
result->bits[i] = delta->bits[i] + a->bits[i];
}
@@
-388,12
+393,12
@@
GNUNET_CRYPTO_hash_sum (const GNUNET_HashCode * a,
* @param result set to a ^ b
*/
void
* @param result set to a ^ b
*/
void
-GNUNET_CRYPTO_hash_xor (const
GNUNET_HashCode * a, cons
t GNUNET_HashCode * b,
- GNUNET_HashCode * result)
+GNUNET_CRYPTO_hash_xor (const
struct GNUNET_HashCode * a, const struc
t GNUNET_HashCode * b,
+
struct
GNUNET_HashCode * result)
{
int i;
{
int i;
- for (i = (sizeof (GNUNET_HashCode) / sizeof (unsigned int)) - 1; i >= 0; i--)
+ for (i = (sizeof (
struct
GNUNET_HashCode) / sizeof (unsigned int)) - 1; i >= 0; i--)
result->bits[i] = a->bits[i] ^ b->bits[i];
}
result->bits[i] = a->bits[i] ^ b->bits[i];
}
@@
-406,11
+411,11
@@
GNUNET_CRYPTO_hash_xor (const GNUNET_HashCode * a, const GNUNET_HashCode * b,
* @param iv set to a valid initialization vector
*/
void
* @param iv set to a valid initialization vector
*/
void
-GNUNET_CRYPTO_hash_to_aes_key (const GNUNET_HashCode * hc,
+GNUNET_CRYPTO_hash_to_aes_key (const
struct
GNUNET_HashCode * hc,
struct GNUNET_CRYPTO_AesSessionKey *skey,
struct GNUNET_CRYPTO_AesInitializationVector *iv)
{
struct GNUNET_CRYPTO_AesSessionKey *skey,
struct GNUNET_CRYPTO_AesInitializationVector *iv)
{
- GNUNET_assert (sizeof (GNUNET_HashCode) >=
+ GNUNET_assert (sizeof (
struct
GNUNET_HashCode) >=
GNUNET_CRYPTO_AES_KEY_LENGTH +
sizeof (struct GNUNET_CRYPTO_AesInitializationVector));
memcpy (skey, hc, GNUNET_CRYPTO_AES_KEY_LENGTH);
GNUNET_CRYPTO_AES_KEY_LENGTH +
sizeof (struct GNUNET_CRYPTO_AesInitializationVector));
memcpy (skey, hc, GNUNET_CRYPTO_AES_KEY_LENGTH);
@@
-428,16
+433,16
@@
GNUNET_CRYPTO_hash_to_aes_key (const GNUNET_HashCode * hc,
* @return Bit \a bit from hashcode \a code, -1 for invalid index
*/
int
* @return Bit \a bit from hashcode \a code, -1 for invalid index
*/
int
-GNUNET_CRYPTO_hash_get_bit (const GNUNET_HashCode * code, unsigned int bit)
+GNUNET_CRYPTO_hash_get_bit (const
struct
GNUNET_HashCode * code, unsigned int bit)
{
{
- GNUNET_assert (bit < 8 * sizeof (GNUNET_HashCode));
+ GNUNET_assert (bit < 8 * sizeof (
struct
GNUNET_HashCode));
return (((unsigned char *) code)[bit >> 3] & (1 << (bit & 7))) > 0;
}
/**
* Determine how many low order bits match in two
return (((unsigned char *) code)[bit >> 3] & (1 << (bit & 7))) > 0;
}
/**
* Determine how many low order bits match in two
- * GNUNET_HashCodes. i.e. - 010011 and 011111 share
+ *
struct
GNUNET_HashCodes. i.e. - 010011 and 011111 share
* the first two lowest order bits, and therefore the
* return value is two (NOT XOR distance, nor how many
* bits match absolutely!).
* the first two lowest order bits, and therefore the
* return value is two (NOT XOR distance, nor how many
* bits match absolutely!).
@@
-448,16
+453,16
@@
GNUNET_CRYPTO_hash_get_bit (const GNUNET_HashCode * code, unsigned int bit)
* @return the number of bits that match
*/
unsigned int
* @return the number of bits that match
*/
unsigned int
-GNUNET_CRYPTO_hash_matching_bits (const GNUNET_HashCode * first,
- const GNUNET_HashCode * second)
+GNUNET_CRYPTO_hash_matching_bits (const
struct
GNUNET_HashCode * first,
+ const
struct
GNUNET_HashCode * second)
{
unsigned int i;
{
unsigned int i;
- for (i = 0; i < sizeof (GNUNET_HashCode) * 8; i++)
+ for (i = 0; i < sizeof (
struct
GNUNET_HashCode) * 8; i++)
if (GNUNET_CRYPTO_hash_get_bit (first, i) !=
GNUNET_CRYPTO_hash_get_bit (second, i))
return i;
if (GNUNET_CRYPTO_hash_get_bit (first, i) !=
GNUNET_CRYPTO_hash_get_bit (second, i))
return i;
- return sizeof (GNUNET_HashCode) * 8;
+ return sizeof (
struct
GNUNET_HashCode) * 8;
}
}
@@
-470,7
+475,7
@@
GNUNET_CRYPTO_hash_matching_bits (const GNUNET_HashCode * first,
* @return 1 if h1 > h2, -1 if h1 < h2 and 0 if h1 == h2.
*/
int
* @return 1 if h1 > h2, -1 if h1 < h2 and 0 if h1 == h2.
*/
int
-GNUNET_CRYPTO_hash_cmp (const
GNUNET_HashCode * h1, cons
t GNUNET_HashCode * h2)
+GNUNET_CRYPTO_hash_cmp (const
struct GNUNET_HashCode * h1, const struc
t GNUNET_HashCode * h2)
{
unsigned int *i1;
unsigned int *i2;
{
unsigned int *i1;
unsigned int *i2;
@@
-478,7
+483,7
@@
GNUNET_CRYPTO_hash_cmp (const GNUNET_HashCode * h1, const GNUNET_HashCode * h2)
i1 = (unsigned int *) h1;
i2 = (unsigned int *) h2;
i1 = (unsigned int *) h1;
i2 = (unsigned int *) h2;
- for (i = (sizeof (GNUNET_HashCode) / sizeof (unsigned int)) - 1; i >= 0; i--)
+ for (i = (sizeof (
struct
GNUNET_HashCode) / sizeof (unsigned int)) - 1; i >= 0; i--)
{
if (i1[i] > i2[i])
return 1;
{
if (i1[i] > i2[i])
return 1;
@@
-499,15
+504,15
@@
GNUNET_CRYPTO_hash_cmp (const GNUNET_HashCode * h1, const GNUNET_HashCode * h2)
* @return -1 if h1 is closer, 1 if h2 is closer and 0 if h1==h2.
*/
int
* @return -1 if h1 is closer, 1 if h2 is closer and 0 if h1==h2.
*/
int
-GNUNET_CRYPTO_hash_xorcmp (const GNUNET_HashCode * h1,
- const GNUNET_HashCode * h2,
- const GNUNET_HashCode * target)
+GNUNET_CRYPTO_hash_xorcmp (const
struct
GNUNET_HashCode * h1,
+ const
struct
GNUNET_HashCode * h2,
+ const
struct
GNUNET_HashCode * target)
{
int i;
unsigned int d1;
unsigned int d2;
{
int i;
unsigned int d1;
unsigned int d2;
- for (i = sizeof (GNUNET_HashCode) / sizeof (unsigned int) - 1; i >= 0; i--)
+ for (i = sizeof (
struct
GNUNET_HashCode) / sizeof (unsigned int) - 1; i >= 0; i--)
{
d1 = ((unsigned int *) h1)[i] ^ ((unsigned int *) target)[i];
d2 = ((unsigned int *) h2)[i] ^ ((unsigned int *) target)[i];
{
d1 = ((unsigned int *) h1)[i] ^ ((unsigned int *) target)[i];
d2 = ((unsigned int *) h2)[i] ^ ((unsigned int *) target)[i];
@@
-571,7
+576,7
@@
GNUNET_CRYPTO_hmac_derive_key_v (struct GNUNET_CRYPTO_AuthKey *key,
void
GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key,
const void *plaintext, size_t plaintext_len,
void
GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key,
const void *plaintext, size_t plaintext_len,
- GNUNET_HashCode * hmac)
+
struct
GNUNET_HashCode * hmac)
{
gcry_md_hd_t md;
const unsigned char *mc;
{
gcry_md_hd_t md;
const unsigned char *mc;
@@
-609,7
+614,7
@@
GNUNET_CRYPTO_short_hash_double (const struct GNUNET_CRYPTO_ShortHashCode *sh,
/**
* Truncate doubled short hash back to a short hash.
*
/**
* Truncate doubled short hash back to a short hash.
*
- * @param
l
h doubled short hash to reduce again
+ * @param
d
h doubled short hash to reduce again
* @param sh where to store the short hash
* @return GNUNET_OK on success, GNUNET_SYSERR if this was not a
* doubled short hash
* @param sh where to store the short hash
* @return GNUNET_OK on success, GNUNET_SYSERR if this was not a
* doubled short hash
@@
-642,7
+647,12
@@
int
GNUNET_CRYPTO_short_hash_from_string2 (const char *enc, size_t enclen,
struct GNUNET_CRYPTO_ShortHashCode * result)
{
GNUNET_CRYPTO_short_hash_from_string2 (const char *enc, size_t enclen,
struct GNUNET_CRYPTO_ShortHashCode * result)
{
- return GNUNET_STRINGS_string_to_data (enc, enclen,
+
+ char upper_enc[enclen];
+ char* up_ptr = upper_enc;
+
+ GNUNET_STRINGS_utf8_toupper(enc, &up_ptr);
+ return GNUNET_STRINGS_string_to_data (upper_enc, enclen,
(unsigned char*) result,
sizeof (struct GNUNET_CRYPTO_ShortHashCode));
}
(unsigned char*) result,
sizeof (struct GNUNET_CRYPTO_ShortHashCode));
}