StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'improve-crypto' of https://github.com/codedust/toxcore

Browse Source
This commit is contained in:
irungentoo 2015-06-07 21:05:30 -04:00
commit 3299452dd9
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toxcore/crypto_core.c
View File

@ -235,9 +235,13 @@ int create_request(const uint8_t *send_public_key, const uint8_t *send_secret_ke
int handle_request(const uint8_t *self_public_key, const uint8_t *self_secret_key, uint8_t *public_key, uint8_t *data, int handle_request(const uint8_t *self_public_key, const uint8_t *self_secret_key, uint8_t *public_key, uint8_t *data,
uint8_t *request_id, const uint8_t *packet, uint16_t length) uint8_t *request_id, const uint8_t *packet, uint16_t length)
{ {
if (length > crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + crypto_box_MACBYTES && if (length <= crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + crypto_box_MACBYTES ||
length <= MAX_CRYPTO_REQUEST_SIZE) { length > MAX_CRYPTO_REQUEST_SIZE)
if (memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) == 0) { return -1;
if (memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) != 0)
return -1;
memcpy(public_key, packet + 1 + crypto_box_PUBLICKEYBYTES, crypto_box_PUBLICKEYBYTES); memcpy(public_key, packet + 1 + crypto_box_PUBLICKEYBYTES, crypto_box_PUBLICKEYBYTES);
uint8_t nonce[crypto_box_NONCEBYTES]; uint8_t nonce[crypto_box_NONCEBYTES];
uint8_t temp[MAX_CRYPTO_REQUEST_SIZE]; uint8_t temp[MAX_CRYPTO_REQUEST_SIZE];
@ -254,7 +258,3 @@ int handle_request(const uint8_t *self_public_key, const uint8_t *self_secret_ke
memcpy(data, temp + 1, len1); memcpy(data, temp + 1, len1);
return len1; return len1;
} }
}
return -1;
}