diff options
Diffstat (limited to 'src/cadet/gnunet-service-cadet_tunnel.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c index 29087dba4..09e91386e 100644 --- a/src/cadet/gnunet-service-cadet_tunnel.c +++ b/src/cadet/gnunet-service-cadet_tunnel.c | |||
@@ -649,7 +649,7 @@ new_ephemeral (struct CadetTunnel *t) | |||
649 | static void | 649 | static void |
650 | t_hmac (const void *plaintext, size_t size, | 650 | t_hmac (const void *plaintext, size_t size, |
651 | uint32_t iv, const struct GNUNET_CRYPTO_SymmetricSessionKey *key, | 651 | uint32_t iv, const struct GNUNET_CRYPTO_SymmetricSessionKey *key, |
652 | struct GNUNET_CADET_Hash *hmac) | 652 | struct GNUNET_ShortHashCode *hmac) |
653 | { | 653 | { |
654 | static const char ctx[] = "cadet authentication key"; | 654 | static const char ctx[] = "cadet authentication key"; |
655 | struct GNUNET_CRYPTO_AuthKey auth_key; | 655 | struct GNUNET_CRYPTO_AuthKey auth_key; |
@@ -916,7 +916,7 @@ try_old_ax_keys (struct CadetTunnel *t, void *dst, | |||
916 | const struct GNUNET_CADET_Encrypted *src, size_t size) | 916 | const struct GNUNET_CADET_Encrypted *src, size_t size) |
917 | { | 917 | { |
918 | struct CadetTunnelSkippedKey *key; | 918 | struct CadetTunnelSkippedKey *key; |
919 | struct GNUNET_CADET_Hash *hmac; | 919 | struct GNUNET_ShortHashCode *hmac; |
920 | struct GNUNET_CRYPTO_SymmetricInitializationVector iv; | 920 | struct GNUNET_CRYPTO_SymmetricInitializationVector iv; |
921 | struct GNUNET_CADET_Encrypted plaintext_header; | 921 | struct GNUNET_CADET_Encrypted plaintext_header; |
922 | struct GNUNET_CRYPTO_SymmetricSessionKey *valid_HK; | 922 | struct GNUNET_CRYPTO_SymmetricSessionKey *valid_HK; |
@@ -1096,7 +1096,7 @@ t_ax_decrypt_and_validate (struct CadetTunnel *t, void *dst, | |||
1096 | size_t size) | 1096 | size_t size) |
1097 | { | 1097 | { |
1098 | struct CadetTunnelAxolotl *ax; | 1098 | struct CadetTunnelAxolotl *ax; |
1099 | struct GNUNET_CADET_Hash msg_hmac; | 1099 | struct GNUNET_ShortHashCode msg_hmac; |
1100 | struct GNUNET_HashCode hmac; | 1100 | struct GNUNET_HashCode hmac; |
1101 | struct GNUNET_CADET_Encrypted plaintext_header; | 1101 | struct GNUNET_CADET_Encrypted plaintext_header; |
1102 | uint32_t Np; | 1102 | uint32_t Np; |
@@ -1406,7 +1406,7 @@ send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
1406 | "Sending message of type %s with PID %u and CID %s\n", | 1406 | "Sending message of type %s with PID %u and CID %s\n", |
1407 | GC_m2s (type), | 1407 | GC_m2s (type), |
1408 | htonl (ax_msg->pid), | 1408 | htonl (ax_msg->pid), |
1409 | GC_h2s (&ax_msg->cid.connection_of_tunnel)); | 1409 | GNUNET_sh2s (&ax_msg->cid.connection_of_tunnel)); |
1410 | 1410 | ||
1411 | if (NULL == cont) | 1411 | if (NULL == cont) |
1412 | { | 1412 | { |