diff options
Diffstat (limited to 'toxav/msi.c')
-rw-r--r-- | toxav/msi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/toxav/msi.c b/toxav/msi.c index 8f69d942..6cc9cf12 100644 --- a/toxav/msi.c +++ b/toxav/msi.c | |||
@@ -893,8 +893,8 @@ int handle_recv_start ( MSISession *session, MSIMessage *msg ) | |||
893 | session->call->key_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); | 893 | session->call->key_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); |
894 | memcpy ( session->call->key_peer, msg->cryptokey.header_value, crypto_secretbox_KEYBYTES ); | 894 | memcpy ( session->call->key_peer, msg->cryptokey.header_value, crypto_secretbox_KEYBYTES ); |
895 | 895 | ||
896 | session->call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); | 896 | session->call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_NONCEBYTES ); |
897 | memcpy ( session->call->nonce_peer, msg->nonce.header_value, crypto_box_NONCEBYTES ); | 897 | memcpy ( session->call->nonce_peer, msg->nonce.header_value, crypto_secretbox_NONCEBYTES ); |
898 | 898 | ||
899 | flush_peer_type ( session, msg, 0 ); | 899 | flush_peer_type ( session, msg, 0 ); |
900 | 900 | ||
@@ -981,21 +981,21 @@ int handle_recv_starting ( MSISession *session, MSIMessage *msg ) | |||
981 | session->call->key_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); | 981 | session->call->key_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); |
982 | new_symmetric_key ( session->call->key_local ); | 982 | new_symmetric_key ( session->call->key_local ); |
983 | 983 | ||
984 | session->call->nonce_local = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); | 984 | session->call->nonce_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_NONCEBYTES ); |
985 | new_nonce ( session->call->nonce_local ); | 985 | new_nonce ( session->call->nonce_local ); |
986 | 986 | ||
987 | /* Save peer key/nonce */ | 987 | /* Save peer key/nonce */ |
988 | session->call->key_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); | 988 | session->call->key_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); |
989 | memcpy ( session->call->key_peer, msg->cryptokey.header_value, crypto_secretbox_KEYBYTES ); | 989 | memcpy ( session->call->key_peer, msg->cryptokey.header_value, crypto_secretbox_KEYBYTES ); |
990 | 990 | ||
991 | session->call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); | 991 | session->call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_NONCEBYTES ); |
992 | memcpy ( session->call->nonce_peer, msg->nonce.header_value, crypto_box_NONCEBYTES ); | 992 | memcpy ( session->call->nonce_peer, msg->nonce.header_value, crypto_secretbox_NONCEBYTES ); |
993 | 993 | ||
994 | session->call->state = call_active; | 994 | session->call->state = call_active; |
995 | 995 | ||
996 | MSIMessage *_msg_start = msi_new_message ( TYPE_REQUEST, stringify_request ( start ) ); | 996 | MSIMessage *_msg_start = msi_new_message ( TYPE_REQUEST, stringify_request ( start ) ); |
997 | msi_msg_set_cryptokey ( _msg_start, session->call->key_local, crypto_secretbox_KEYBYTES ); | 997 | msi_msg_set_cryptokey ( _msg_start, session->call->key_local, crypto_secretbox_KEYBYTES ); |
998 | msi_msg_set_nonce ( _msg_start, session->call->nonce_local, crypto_box_NONCEBYTES ); | 998 | msi_msg_set_nonce ( _msg_start, session->call->nonce_local, crypto_secretbox_NONCEBYTES ); |
999 | send_message ( session, _msg_start, msg->friend_id ); | 999 | send_message ( session, _msg_start, msg->friend_id ); |
1000 | free_message ( _msg_start ); | 1000 | free_message ( _msg_start ); |
1001 | 1001 | ||
@@ -1341,11 +1341,11 @@ int msi_answer ( MSISession *session, MSICallType call_type ) | |||
1341 | session->call->key_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); | 1341 | session->call->key_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES ); |
1342 | new_symmetric_key ( session->call->key_local ); | 1342 | new_symmetric_key ( session->call->key_local ); |
1343 | 1343 | ||
1344 | session->call->nonce_local = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES ); | 1344 | session->call->nonce_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_NONCEBYTES ); |
1345 | new_nonce ( session->call->nonce_local ); | 1345 | new_nonce ( session->call->nonce_local ); |
1346 | 1346 | ||
1347 | msi_msg_set_cryptokey ( _msg_starting, session->call->key_local, crypto_secretbox_KEYBYTES ); | 1347 | msi_msg_set_cryptokey ( _msg_starting, session->call->key_local, crypto_secretbox_KEYBYTES ); |
1348 | msi_msg_set_nonce ( _msg_starting, session->call->nonce_local, crypto_box_NONCEBYTES ); | 1348 | msi_msg_set_nonce ( _msg_starting, session->call->nonce_local, crypto_secretbox_NONCEBYTES ); |
1349 | 1349 | ||
1350 | send_message ( session, _msg_starting, session->call->peers[session->call->peer_count - 1] ); | 1350 | send_message ( session, _msg_starting, session->call->peers[session->call->peer_count - 1] ); |
1351 | free_message ( _msg_starting ); | 1351 | free_message ( _msg_starting ); |