summaryrefslogtreecommitdiff
path: root/src/util/crypto_hash.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-10-07 19:57:27 +0000
committerChristian Grothoff <christian@grothoff.org>2010-10-07 19:57:27 +0000
commitfaf7ea3640432864044108d16c311f72e4a0826d (patch)
tree3b584489fb845c9ba9079462bae5e82139b25d37 /src/util/crypto_hash.c
parentc03a8dc85818b7c22d14a19f6b50fd93b526edbb (diff)
downloadgnunet-faf7ea3640432864044108d16c311f72e4a0826d.tar.gz
gnunet-faf7ea3640432864044108d16c311f72e4a0826d.zip
fixing compile errors
Diffstat (limited to 'src/util/crypto_hash.c')
-rw-r--r--src/util/crypto_hash.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 72dc48399..8ec822434 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -161,7 +161,7 @@ file_hash_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
161 if (fhc->offset == fhc->fsize) 161 if (fhc->offset == fhc->fsize)
162 { 162 {
163 res = (GNUNET_HashCode *) gcry_md_read (fhc->md, GCRY_MD_SHA512); 163 res = (GNUNET_HashCode *) gcry_md_read (fhc->md, GCRY_MD_SHA512);
164 file_hash_finish (fhc, &res); 164 file_hash_finish (fhc, res);
165 gcry_md_close (fhc->md); 165 gcry_md_close (fhc->md);
166 return; 166 return;
167 } 167 }
@@ -200,7 +200,12 @@ GNUNET_CRYPTO_hash_file (struct GNUNET_SCHEDULER_Handle *sched,
200 fhc->sched = sched; 200 fhc->sched = sched;
201 fhc->buffer = (unsigned char *) &fhc[1]; 201 fhc->buffer = (unsigned char *) &fhc[1];
202 fhc->filename = GNUNET_strdup (filename); 202 fhc->filename = GNUNET_strdup (filename);
203 fhc->md = gcry_md_open (&fhc->md, GCRY_MD_SHA512, 0); 203 if (GPG_ERR_NO_ERROR != gcry_md_open (&fhc->md, GCRY_MD_SHA512, 0))
204 {
205 GNUNET_break (0);
206 GNUNET_free (fhc);
207 return NULL;
208 }
204 fhc->bsize = blocksize; 209 fhc->bsize = blocksize;
205 if (GNUNET_OK != GNUNET_DISK_file_size (filename, &fhc->fsize, GNUNET_NO)) 210 if (GNUNET_OK != GNUNET_DISK_file_size (filename, &fhc->fsize, GNUNET_NO))
206 { 211 {
@@ -572,7 +577,7 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key,
572 gcry_md_hd_t md; 577 gcry_md_hd_t md;
573 unsigned char *mc; 578 unsigned char *mc;
574 579
575 md = gcry_md_open (&md, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC); 580 GNUNET_assert (GPG_ERR_NO_ERROR == gcry_md_open (&md, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC));
576 gcry_md_setkey (md, key->key, sizeof(key->key)); 581 gcry_md_setkey (md, key->key, sizeof(key->key));
577 gcry_md_write (md, plaintext, plaintext_len); 582 gcry_md_write (md, plaintext, plaintext_len);
578 mc = gcry_md_read (md, GCRY_MD_SHA512); 583 mc = gcry_md_read (md, GCRY_MD_SHA512);