void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-26 17:03:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build fixes, warning removal.

Browse source
This commit is contained in:
Adam Ierymenko 2021-05-19 16:24:21 -04:00
parent ea650ad7c5
commit a513d160c5
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/AES_aesni.cpp
View file

@ -30,7 +30,7 @@ namespace {
const __m128i s_sseSwapBytes = _mm_set_epi8(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
#ifdef __GNUC__
__attribute__((__target__("sse,sse2,pclmul")))
__attribute__((__target__("sse,sse2,ssse3,aes,pclmul")))
#endif
__m128i
p_gmacPCLMUL128(const __m128i h, __m128i y) noexcept
@ -245,7 +245,7 @@ p_init256_2_aesni(__m128i a, __m128i b) noexcept
} // anonymous namespace
#ifdef __GNUC__
__attribute__((__target__("sse,sse2,pclmul,aes")))
__attribute__((__target__("sse,sse2,ssse3,pclmul,aes")))
#endif
void AES::GMAC::p_aesNIUpdate(const uint8_t *in, unsigned int len) noexcept
{
@ -333,7 +333,7 @@ void AES::GMAC::p_aesNIUpdate(const uint8_t *in, unsigned int len) noexcept
}
#ifdef __GNUC__
__attribute__((__target__("sse,sse2,pclmul,aes")))
__attribute__((__target__("sse,sse2,ssse3,pclmul,aes")))
#endif
void AES::GMAC::p_aesNIFinish(uint8_t tag[16]) noexcept
{
@ -607,7 +607,7 @@ void AES::CTR::p_aesNICrypt(const uint8_t *in, uint8_t *out, unsigned int len) n
}
#ifdef __GNUC__
__attribute__((__target__("sse,sse2,aes,pclmul")))
__attribute__((__target__("sse,sse2,ssse3,aes,pclmul")))
#endif
void AES::p_init_aesni(const uint8_t *key) noexcept
{

4
core/Address.hpp
View file

@ -87,8 +87,8 @@ class Address : public TriviallyCopyable {
*/
ZT_INLINE char *toString(char s[ZT_ADDRESS_STRING_SIZE_MAX]) const noexcept
{
for (unsigned int i = 0; i < 10;) {
s[i++] = Utils::HEXCHARS[(uintptr_t)(_a >> (36U - (i * 4U))) & 0xfU];
for (unsigned int i = 0; i < 10; ++i) {
s[i] = Utils::HEXCHARS[(uintptr_t)(_a >> (36U - (i * 4U))) & 0xfU];
}
return s;
}

2
core/C25519.cpp
View file

@ -3038,7 +3038,7 @@ ZT_INLINE void get_hram(
playground[i] = sm[i];
for (int i = 32; i < 64; ++i)
playground[i] = pk[i - 32];
for (int i = 64; i < smlen; ++i)
for (unsigned long long i = 64; i < smlen; ++i)
playground[i] = sm[i];
ZeroTier::SHA512(hram, playground, (unsigned int)smlen);
}