kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-23 20:15:19 -07:00
Code Releases Wiki Activity

Format multi-line comments consistently

Browse Source
This commit is contained in:
Frank Denis 2020-03-11 19:14:54 +01:00
parent e7e378fad1
commit f3b0e32d64
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libsodium/crypto_secretbox/crypto_secretbox_easy.c
View File

@ -27,13 +27,14 @@ crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
crypto_core_hsalsa20(subkey, n, k, NULL);
/* Allow the m and and c buffer to partially overlap, by calling
memmove() if necessary.
Note that there is no fully portable way to compare pointers.
Some tools even report undefined behavior, despite the conversion.
Nevertheless, this works on all supported platforms.
*/
/*
* Allow the m and and c buffer to partially overlap, by calling
* memmove() if necessary.
*
* Note that there is no fully portable way to compare pointers.
* Some tools even report undefined behavior, despite the conversion.
* Nevertheless, this works on all supported platforms.
*/
if (((uintptr_t) c > (uintptr_t) m &&
(uintptr_t) c - (uintptr_t) m < mlen) ||
((uintptr_t) m > (uintptr_t) c &&
@ -108,13 +109,14 @@ crypto_secretbox_open_detached(unsigned char *m, const unsigned char *c,
if (m == NULL) {
return 0;
}
/* Allow the m and and c buffer to partially overlap, by calling
memmove() if necessary.
Note that there is no fully portable way to compare pointers.
Some tools even report undefined behavior, despite the conversion.
Nevertheless, this works on all supported platforms.
*/
/*
* Allow the m and and c buffer to partially overlap, by calling
* memmove() if necessary.
*
* Note that there is no fully portable way to compare pointers.
* Some tools even report undefined behavior, despite the conversion.
* Nevertheless, this works on all supported platforms.
*/
if (((uintptr_t) c > (uintptr_t) m &&
(uintptr_t) c - (uintptr_t) m < clen) ||
((uintptr_t) m > (uintptr_t) c &&

30
src/libsodium/crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c
View File

@ -31,13 +31,14 @@ crypto_secretbox_xchacha20poly1305_detached(unsigned char *c,
crypto_core_hchacha20(subkey, n, k, NULL);
/* Allow the m and and c buffer to partially overlap, by calling
memmove() if necessary.
Note that there is no fully portable way to compare pointers.
Some tools even report undefined behavior, despite the conversion.
Nevertheless, this works on all supported platforms.
*/
/*
* Allow the m and and c buffer to partially overlap, by calling
* memmove() if necessary.
*
* Note that there is no fully portable way to compare pointers.
* Some tools even report undefined behavior, despite the conversion.
* Nevertheless, this works on all supported platforms.
*/
if (((uintptr_t) c > (uintptr_t) m &&
(uintptr_t) c - (uintptr_t) m < mlen) ||
((uintptr_t) m > (uintptr_t) c &&
@ -115,13 +116,14 @@ crypto_secretbox_xchacha20poly1305_open_detached(unsigned char *m,
if (m == NULL) {
return 0;
}
/* Allow the m and and c buffer to partially overlap, by calling
memmove() if necessary.
Note that there is no fully portable way to compare pointers.
Some tools even report undefined behavior, despite the conversion.
Nevertheless, this works on all supported platforms.
*/
/*
* Allow the m and and c buffer to partially overlap, by calling
* memmove() if necessary.
*
* Note that there is no fully portable way to compare pointers.
* Some tools even report undefined behavior, despite the conversion.
* Nevertheless, this works on all supported platforms.
*/
if (((uintptr_t) c > (uintptr_t) m &&
(uintptr_t) c - (uintptr_t) m < clen) ||
((uintptr_t) m > (uintptr_t) c &&