diff options
author | Nils Durner <durner@gnunet.org> | 2010-10-03 13:29:09 +0000 |
---|---|---|
committer | Nils Durner <durner@gnunet.org> | 2010-10-03 13:29:09 +0000 |
commit | 9d9853441df5b565f6932fcf7fbb156b2d929392 (patch) | |
tree | 87d09554c804030a48fe33e46206c91dc312bf12 /src/core | |
parent | b7c95147188502651e4cb2b60c7062137f73e878 (diff) | |
download | gnunet-9d9853441df5b565f6932fcf7fbb156b2d929392.tar.gz gnunet-9d9853441df5b565f6932fcf7fbb156b2d929392.zip |
KDF code
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/gnunet-service-core.c | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 9496d2209..8ceb92ac6 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c | |||
@@ -2122,10 +2122,11 @@ process_plaintext_neighbour_queue (struct Neighbour *n) | |||
2122 | em->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_ENCRYPTED_MESSAGE); | 2122 | em->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_ENCRYPTED_MESSAGE); |
2123 | em->iv_seed = ph->iv_seed; | 2123 | em->iv_seed = ph->iv_seed; |
2124 | esize = used - ENCRYPTED_HEADER_SIZE; | 2124 | esize = used - ENCRYPTED_HEADER_SIZE; |
2125 | GNUNET_CRYPTO_hmac (&n->encrypt_key, | 2125 | // FIXME NILS |
2126 | &ph->sequence_number, | 2126 | // GNUNET_CRYPTO_hmac (&n->encrypt_key, |
2127 | esize - sizeof (GNUNET_HashCode), | 2127 | // &ph->sequence_number, |
2128 | &ph->hmac); | 2128 | // esize - sizeof (GNUNET_HashCode), |
2129 | // &ph->hmac); | ||
2129 | GNUNET_CRYPTO_hash (&ph->iv_seed, sizeof (uint32_t), &iv); | 2130 | GNUNET_CRYPTO_hash (&ph->iv_seed, sizeof (uint32_t), &iv); |
2130 | #if DEBUG_HANDSHAKE | 2131 | #if DEBUG_HANDSHAKE |
2131 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2132 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -3356,24 +3357,25 @@ handle_encrypted_message (struct Neighbour *n, | |||
3356 | return; | 3357 | return; |
3357 | pt = (struct EncryptedMessage *) buf; | 3358 | pt = (struct EncryptedMessage *) buf; |
3358 | /* validate hash */ | 3359 | /* validate hash */ |
3359 | GNUNET_CRYPTO_hmac (&n->decrypt_key, | 3360 | // FIXME NILS |
3360 | &pt->sequence_number, | 3361 | // GNUNET_CRYPTO_hmac (&n->decrypt_key, |
3361 | size - ENCRYPTED_HEADER_SIZE - sizeof (GNUNET_HashCode), &ph); | 3362 | // &pt->sequence_number, |
3362 | #if DEBUG_HANDSHAKE | 3363 | // size - ENCRYPTED_HEADER_SIZE - sizeof (GNUNET_HashCode), &ph); |
3363 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 3364 | //#if DEBUG_HANDSHAKE |
3364 | "V-Hashed %u bytes of plaintext (`%s') using IV `%d'\n", | 3365 | // GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
3365 | (unsigned int) (size - ENCRYPTED_HEADER_SIZE - sizeof (GNUNET_HashCode)), | 3366 | // "V-Hashed %u bytes of plaintext (`%s') using IV `%d'\n", |
3366 | GNUNET_h2s (&ph), | 3367 | // (unsigned int) (size - ENCRYPTED_HEADER_SIZE - sizeof (GNUNET_HashCode)), |
3367 | (int) m->iv_seed); | 3368 | // GNUNET_h2s (&ph), |
3368 | #endif | 3369 | // (int) m->iv_seed); |
3369 | if (0 != memcmp (&ph, | 3370 | //#endif |
3370 | &pt->hmac, | 3371 | // if (0 != memcmp (&ph, |
3371 | sizeof (GNUNET_HashCode))) | 3372 | // &pt->hmac, |
3372 | { | 3373 | // sizeof (GNUNET_HashCode))) |
3373 | /* checksum failed */ | 3374 | // { |
3374 | GNUNET_break_op (0); | 3375 | // /* checksum failed */ |
3375 | return; | 3376 | // GNUNET_break_op (0); |
3376 | } | 3377 | // return; |
3378 | // } | ||
3377 | 3379 | ||
3378 | /* validate sequence number */ | 3380 | /* validate sequence number */ |
3379 | snum = ntohl (pt->sequence_number); | 3381 | snum = ntohl (pt->sequence_number); |