diff options
Diffstat (limited to 'src/cadet/gnunet-service-cadet_tunnels.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnels.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index ca91a0e01..c7e422926 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c | |||
@@ -674,7 +674,7 @@ new_ephemeral (struct CadetTunnelAxolotl *ax) | |||
674 | * @param size Size of @c plaintext. | 674 | * @param size Size of @c plaintext. |
675 | * @param iv Initialization vector for the message. | 675 | * @param iv Initialization vector for the message. |
676 | * @param key Key to use. | 676 | * @param key Key to use. |
677 | * @param hmac[out] Destination to store the HMAC. | 677 | * @param[out] hmac Destination to store the HMAC. |
678 | */ | 678 | */ |
679 | static void | 679 | static void |
680 | t_hmac (const void *plaintext, | 680 | t_hmac (const void *plaintext, |
@@ -890,7 +890,7 @@ t_ax_decrypt (struct CadetTunnelAxolotl *ax, | |||
890 | * Encrypt header with the axolotl header key. | 890 | * Encrypt header with the axolotl header key. |
891 | * | 891 | * |
892 | * @param ax key material to use. | 892 | * @param ax key material to use. |
893 | * @param[in|out] msg Message whose header to encrypt. | 893 | * @param[in,out] msg Message whose header to encrypt. |
894 | */ | 894 | */ |
895 | static void | 895 | static void |
896 | t_h_encrypt (struct CadetTunnelAxolotl *ax, | 896 | t_h_encrypt (struct CadetTunnelAxolotl *ax, |
@@ -1488,7 +1488,7 @@ cleanup_ax (struct CadetTunnelAxolotl *ax) | |||
1488 | * Computes the new chain keys, and root keys, etc, and also checks | 1488 | * Computes the new chain keys, and root keys, etc, and also checks |
1489 | * whether this is a replay of the current chain. | 1489 | * whether this is a replay of the current chain. |
1490 | * | 1490 | * |
1491 | * @param[in|out] axolotl chain key state to recompute | 1491 | * @param[in,out] ax chain key state to recompute |
1492 | * @param pid peer identity of the other peer | 1492 | * @param pid peer identity of the other peer |
1493 | * @param ephemeral_key ephemeral public key of the other peer | 1493 | * @param ephemeral_key ephemeral public key of the other peer |
1494 | * @param ratchet_key senders next ephemeral public key | 1494 | * @param ratchet_key senders next ephemeral public key |
@@ -3487,15 +3487,6 @@ GCT_send (struct CadetTunnel *t, | |||
3487 | } | 3487 | } |
3488 | 3488 | ||
3489 | 3489 | ||
3490 | /** | ||
3491 | * Cancel a previously sent message while it's in the queue. | ||
3492 | * | ||
3493 | * ONLY can be called before the continuation given to the send | ||
3494 | * function is called. Once the continuation is called, the message is | ||
3495 | * no longer in the queue! | ||
3496 | * | ||
3497 | * @param tq Handle to the queue entry to cancel. | ||
3498 | */ | ||
3499 | void | 3490 | void |
3500 | GCT_send_cancel (struct CadetTunnelQueueEntry *tq) | 3491 | GCT_send_cancel (struct CadetTunnelQueueEntry *tq) |
3501 | { | 3492 | { |