diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-12-25 15:50:16 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-12-25 15:50:16 +0100 |
commit | bcf193771c8efecf99b6fc86e4d0375c6164e208 (patch) | |
tree | 539afbeb32ec21ab1d14882d77aab9526ef6cf3c /src/transport | |
parent | 362288ecbadeaf827a0a29908d42407ce1e2700a (diff) | |
parent | 7398be32b31ced600e182a3f63f3eddec0338dd9 (diff) | |
download | gnunet-bcf193771c8efecf99b6fc86e4d0375c6164e208.tar.gz gnunet-bcf193771c8efecf99b6fc86e4d0375c6164e208.zip |
Merge branch 'master' of git+ssh://gnunet.org/gnunet
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-communicator-tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c index 7207eb922..0b7f6ab46 100644 --- a/src/transport/gnunet-communicator-tcp.c +++ b/src/transport/gnunet-communicator-tcp.c | |||
@@ -1553,7 +1553,7 @@ transmit_kx (struct Queue *queue, | |||
1553 | struct TCPConfirmation tc; | 1553 | struct TCPConfirmation tc; |
1554 | 1554 | ||
1555 | memcpy (queue->cwrite_buf, epub, sizeof(*epub)); | 1555 | memcpy (queue->cwrite_buf, epub, sizeof(*epub)); |
1556 | queue->cwrite_off = sizeof(epub); | 1556 | queue->cwrite_off = sizeof(*epub); |
1557 | /* compute 'tc' and append in encrypted format to cwrite_buf */ | 1557 | /* compute 'tc' and append in encrypted format to cwrite_buf */ |
1558 | tc.sender = my_identity; | 1558 | tc.sender = my_identity; |
1559 | tc.monotonic_time = | 1559 | tc.monotonic_time = |
@@ -1621,7 +1621,7 @@ decrypt_and_check_tc (struct Queue *queue, | |||
1621 | tc, | 1621 | tc, |
1622 | sizeof(*tc), | 1622 | sizeof(*tc), |
1623 | &ibuf[sizeof(struct GNUNET_CRYPTO_EcdhePublicKey)], | 1623 | &ibuf[sizeof(struct GNUNET_CRYPTO_EcdhePublicKey)], |
1624 | sizeof(tc))); | 1624 | sizeof(*tc))); |
1625 | ths.purpose.purpose = htonl (GNUNET_SIGNATURE_COMMUNICATOR_TCP_HANDSHAKE); | 1625 | ths.purpose.purpose = htonl (GNUNET_SIGNATURE_COMMUNICATOR_TCP_HANDSHAKE); |
1626 | ths.purpose.size = htonl (sizeof(ths)); | 1626 | ths.purpose.size = htonl (sizeof(ths)); |
1627 | ths.sender = tc->sender; | 1627 | ths.sender = tc->sender; |