1
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-19 10:05:05 -07:00

Merge branch 'master' of github.com:jedisct1/libsodium

* 'master' of github.com:jedisct1/libsodium:
  Nits
  Remove unneeded casts
  Indent
This commit is contained in:
Frank Denis 2020-05-10 20:28:35 +02:00
commit 5bb0cdc616
4 changed files with 12 additions and 17 deletions

View File

@ -22,7 +22,8 @@ as well as Javascript and Webassembly.
## Documentation
The documentation is available on Gitbook and built from the [libsodium-doc](https://github.com/jedisct1/libsodium-doc) repository:
The documentation is available on Gitbook and built from the
[libsodium-doc](https://github.com/jedisct1/libsodium-doc) repository:
* [libsodium documentation](https://doc.libsodium.org) - online, requires Javascript.
@ -51,9 +52,7 @@ This project exists thanks to all the people who contribute. [[Contribute](CONTR
Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/libsodium/contribute)]
#### Individuals
<a href="https://opencollective.com/libsodium"><img src="https://opencollective.com/libsodium/individuals.svg?width=890"></a>
#### Individuals Href="https://opencollective.com/libsodium"><img src="https://opencollective.com/libsodium/individuals.svg?width=890"></a>
#### Organizations
@ -61,8 +60,6 @@ Support this project with your organization. Your logo will show up here with a
<a href="https://opencollective.com/libsodium/organization/0/website"><img src="https://opencollective.com/libsodium/organization/0/avatar.svg"></a>
## License
[ISC license](https://en.wikipedia.org/wiki/ISC_license).

View File

@ -41,14 +41,14 @@ typedef struct poly1305_state_internal_t {
union {
uint64_t h[3];
uint32_t hh[10];
} H; /* 40 bytes */
uint32_t R[5]; /* 20 bytes */
uint32_t R2[5]; /* 20 bytes */
uint32_t R4[5]; /* 20 bytes */
uint64_t pad[2]; /* 16 bytes */
uint64_t flags; /* 8 bytes */
unsigned long long leftover; /* 8 bytes */
unsigned char buffer[poly1305_block_size]; /* 32 bytes */
} H; /* 40 bytes */
uint32_t R[5]; /* 20 bytes */
uint32_t R2[5]; /* 20 bytes */
uint32_t R4[5]; /* 20 bytes */
uint64_t pad[2]; /* 16 bytes */
uint64_t flags; /* 8 bytes */
unsigned long long leftover; /* 8 bytes */
unsigned char buffer[poly1305_block_size]; /* 32 bytes */
} poly1305_state_internal_t; /* 164 bytes total */
/*

View File

@ -131,8 +131,7 @@ fe25519_cmov(fe25519 f, const fe25519 g, unsigned int b)
"movq %[t0], 24(%[a])\n"
"movq %[t1], 32(%[a])\n"
: [ t0 ] "=&r"(t0), [ t1 ] "=&r"(t1), [ t2 ] "=&r"(t2)
: [ a ] "r"(*(unsigned char(*)[40]) f),
[ b ] "r"(*(const unsigned char(*)[40]) g), [ c ] "r"(b)
: [ a ] "r"(f), [ b ] "r"(g), [ c ] "r"(b)
: "cc");
#else
uint64_t mask = (uint64_t) (-(int64_t) b);

View File

@ -1,4 +1,3 @@
#include <assert.h>
#include <errno.h>
#include <fcntl.h>