aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxrs <xrs@mail36.net>2017-06-22 21:53:36 +0200
committerxrs <xrs@mail36.net>2017-06-22 21:53:36 +0200
commita0b43a2805e5abd47783ef225b6c2407cfe9cc32 (patch)
tree23ab530b7c54b652a418d1f79d69c37c3e705afc /src
parentebc75d1fb3b115c25a34c9a205af3f3c83279758 (diff)
parent48d19dca4b6fe9c4396877a65499e7a8d7f50ad0 (diff)
downloadgnunet-a0b43a2805e5abd47783ef225b6c2407cfe9cc32.tar.gz
gnunet-a0b43a2805e5abd47783ef225b6c2407cfe9cc32.zip
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src')
-rw-r--r--src/conversation/test_conversation.conf2
-rw-r--r--src/util/crypto_hash.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/conversation/test_conversation.conf b/src/conversation/test_conversation.conf
index e0fd8200c..87c4b8f07 100644
--- a/src/conversation/test_conversation.conf
+++ b/src/conversation/test_conversation.conf
@@ -2,7 +2,7 @@
2 2
3[conversation] 3[conversation]
4LINE=1 4LINE=1
5PREFIX = valgrind 5#PREFIX = valgrind
6 6
7[nse] 7[nse]
8WORKBITS = 0 8WORKBITS = 0
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 49dbacd0b..20c7ca7ff 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -440,8 +440,8 @@ GNUNET_CRYPTO_hash_context_start ()
440 */ 440 */
441void 441void
442GNUNET_CRYPTO_hash_context_read (struct GNUNET_HashContext *hc, 442GNUNET_CRYPTO_hash_context_read (struct GNUNET_HashContext *hc,
443 const void *buf, 443 const void *buf,
444 size_t size) 444 size_t size)
445{ 445{
446 gcry_md_write (hc->hd, buf, size); 446 gcry_md_write (hc->hd, buf, size);
447} 447}