aboutsummaryrefslogtreecommitdiff
path: root/src/mesh/gnunet-service-mesh_tunnel.c
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2014-04-07 12:00:28 +0000
committerBart Polot <bart@net.in.tum.de>2014-04-07 12:00:28 +0000
commit22f59cade743d9209cf212946a42b859bbb51b87 (patch)
tree7dbb95ac1d6cf64477510c67c365c6c04182b1d2 /src/mesh/gnunet-service-mesh_tunnel.c
parent864a6bfe96db3c0eae0dc188708dcac0ac4ce9cd (diff)
downloadgnunet-22f59cade743d9209cf212946a42b859bbb51b87.tar.gz
gnunet-22f59cade743d9209cf212946a42b859bbb51b87.zip
- rename 256 bit mesh hash type
Diffstat (limited to 'src/mesh/gnunet-service-mesh_tunnel.c')
-rw-r--r--src/mesh/gnunet-service-mesh_tunnel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c
index 782a02c80..6a86ad2d6 100644
--- a/src/mesh/gnunet-service-mesh_tunnel.c
+++ b/src/mesh/gnunet-service-mesh_tunnel.c
@@ -756,7 +756,7 @@ queue_data (struct MeshTunnel3 *t, const struct GNUNET_MessageHeader *msg)
756 */ 756 */
757static void 757static void
758t_hmac (struct MeshTunnel3 *t, const void *plaintext, size_t size, uint32_t iv, 758t_hmac (struct MeshTunnel3 *t, const void *plaintext, size_t size, uint32_t iv,
759 int outgoing, struct GNUNET_MeshHash *hmac) 759 int outgoing, struct GNUNET_MESH_Hash *hmac)
760{ 760{
761 struct GNUNET_CRYPTO_AuthKey auth_key; 761 struct GNUNET_CRYPTO_AuthKey auth_key;
762 static const char ctx[] = "mesh authentication key"; 762 static const char ctx[] = "mesh authentication key";
@@ -1675,7 +1675,7 @@ GMT_handle_encrypted (struct MeshTunnel3 *t,
1675 char cbuf [payload_size]; 1675 char cbuf [payload_size];
1676 struct GNUNET_MessageHeader *msgh; 1676 struct GNUNET_MessageHeader *msgh;
1677 unsigned int off; 1677 unsigned int off;
1678 struct GNUNET_MeshHash hmac; 1678 struct GNUNET_MESH_Hash hmac;
1679 1679
1680 decrypted_size = t_decrypt (t, cbuf, &msg[1], payload_size, msg->iv); 1680 decrypted_size = t_decrypt (t, cbuf, &msg[1], payload_size, msg->iv);
1681 t_hmac (t, &msg[1], payload_size, msg->iv, GNUNET_NO, &hmac); 1681 t_hmac (t, &msg[1], payload_size, msg->iv, GNUNET_NO, &hmac);
@@ -2237,7 +2237,7 @@ struct MeshConnection *
2237GMT_use_path (struct MeshTunnel3 *t, struct MeshPeerPath *p) 2237GMT_use_path (struct MeshTunnel3 *t, struct MeshPeerPath *p)
2238{ 2238{
2239 struct MeshConnection *c; 2239 struct MeshConnection *c;
2240 struct GNUNET_MeshHash cid; 2240 struct GNUNET_MESH_Hash cid;
2241 unsigned int own_pos; 2241 unsigned int own_pos;
2242 2242
2243 if (NULL == t || NULL == p) 2243 if (NULL == t || NULL == p)