Move 25.5 bit field arithmetic to ref10/fe_25_5

This commit is contained in:
Frank Denis 2017-11-05 17:35:22 +01:00
parent 5cde320a08
commit bd82e08337
16 changed files with 79 additions and 1165 deletions

View File

@ -303,8 +303,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\u8.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\salsa20_xmm6int-sse2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
<ItemGroup>

View File

@ -698,11 +698,14 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h">
<Filter>crypto_stream\salsa20\xmm6</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@ -757,6 +760,9 @@
<Filter Include="crypto_core\curve25519\ref10">
<UniqueIdentifier>{ff5842af-bbd1-3a87-9939-c36522a38fb8}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\curve25519\ref10\fe_25_5">
<UniqueIdentifier>{e1a65ae7-b847-3441-bb23-e3eebbd63e9c}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\hchacha20">
<UniqueIdentifier>{8b704d11-af1f-30c0-9981-479da6d88dc3}</UniqueIdentifier>
</Filter>

View File

@ -303,8 +303,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\u8.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\salsa20_xmm6int-sse2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
<ItemGroup>

View File

@ -698,11 +698,14 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h">
<Filter>crypto_stream\salsa20\xmm6</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@ -757,6 +760,9 @@
<Filter Include="crypto_core\curve25519\ref10">
<UniqueIdentifier>{ff5842af-bbd1-3a87-9939-c36522a38fb8}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\curve25519\ref10\fe_25_5">
<UniqueIdentifier>{e1a65ae7-b847-3441-bb23-e3eebbd63e9c}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\hchacha20">
<UniqueIdentifier>{8b704d11-af1f-30c0-9981-479da6d88dc3}</UniqueIdentifier>
</Filter>

View File

@ -303,8 +303,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\u8.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\salsa20_xmm6int-sse2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
<ItemGroup>

View File

@ -698,11 +698,14 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h">
<Filter>crypto_stream\salsa20\xmm6</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@ -757,6 +760,9 @@
<Filter Include="crypto_core\curve25519\ref10">
<UniqueIdentifier>{ff5842af-bbd1-3a87-9939-c36522a38fb8}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\curve25519\ref10\fe_25_5">
<UniqueIdentifier>{e1a65ae7-b847-3441-bb23-e3eebbd63e9c}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\hchacha20">
<UniqueIdentifier>{8b704d11-af1f-30c0-9981-479da6d88dc3}</UniqueIdentifier>
</Filter>

View File

@ -303,8 +303,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\u8.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\salsa20_xmm6int-sse2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
<ItemGroup>

View File

@ -698,11 +698,14 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h">
<Filter>crypto_stream\salsa20\xmm6</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@ -757,6 +760,9 @@
<Filter Include="crypto_core\curve25519\ref10">
<UniqueIdentifier>{ff5842af-bbd1-3a87-9939-c36522a38fb8}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\curve25519\ref10\fe_25_5">
<UniqueIdentifier>{e1a65ae7-b847-3441-bb23-e3eebbd63e9c}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\hchacha20">
<UniqueIdentifier>{8b704d11-af1f-30c0-9981-479da6d88dc3}</UniqueIdentifier>
</Filter>

View File

@ -303,8 +303,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\u8.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6int\salsa20_xmm6int-sse2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
<ItemGroup>

View File

@ -698,11 +698,14 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h">
<Filter>crypto_stream\salsa20\xmm6</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base2.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\base.h">
<Filter>crypto_core\curve25519\ref10</Filter>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h">
<Filter>crypto_core\curve25519\ref10\fe_25_5</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@ -757,6 +760,9 @@
<Filter Include="crypto_core\curve25519\ref10">
<UniqueIdentifier>{ff5842af-bbd1-3a87-9939-c36522a38fb8}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\curve25519\ref10\fe_25_5">
<UniqueIdentifier>{e1a65ae7-b847-3441-bb23-e3eebbd63e9c}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\hchacha20">
<UniqueIdentifier>{8b704d11-af1f-30c0-9981-479da6d88dc3}</UniqueIdentifier>
</Filter>

View File

@ -541,8 +541,9 @@
<ClInclude Include="src\libsodium\crypto_stream\salsa20\xmm6int\u8.h" />
<ClInclude Include="src\libsodium\crypto_stream\salsa20\xmm6int\salsa20_xmm6int-sse2.h" />
<ClInclude Include="src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h" />
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\base2.h" />
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\base.h" />
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h" />
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h" />
<ClInclude Include="builds\msvc\resource.h" />
</ItemGroup>
<ItemGroup>

View File

@ -689,10 +689,13 @@
<ClInclude Include="src\libsodium\crypto_stream\salsa20\xmm6\salsa20_xmm6.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\base2.h">
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\fe_25_5\fe.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\base.h">
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base2.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\fe_25_5\base.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

View File

@ -12,8 +12,9 @@ libsodium_la_SOURCES = \
crypto_box/crypto_box_easy.c \
crypto_box/crypto_box_seal.c \
crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c \
crypto_core/curve25519/ref10/base.h \
crypto_core/curve25519/ref10/base2.h \
crypto_core/curve25519/ref10/fe_25_5/base.h \
crypto_core/curve25519/ref10/fe_25_5/base2_25_5.h \
crypto_core/curve25519/ref10/fe_25_5/fe.h \
crypto_core/curve25519/ref10/curve25519_ref10.c \
crypto_core/hchacha20/core_hchacha20.c \
crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c \

File diff suppressed because it is too large Load Diff