Add ARM acceleration for SHA3

This commit is contained in:
Frank Denis
2026-01-11 17:13:18 +01:00
parent 1a572b5028
commit 3804ecc0e2
24 changed files with 449 additions and 5 deletions
@@ -193,6 +193,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\keccak1600.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
@@ -356,6 +357,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_armcrypto.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_soft.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
@@ -399,6 +399,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c">
<Filter>crypto_core\salsa\ref</Filter>
</ClCompile>
@@ -884,6 +887,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
<Filter>crypto_core\ed25519\ref10\fe_25_5</Filter>
</ClInclude>
@@ -982,6 +988,9 @@
<Filter Include="crypto_core\keccak1600">
<UniqueIdentifier>{85c1722f-2d65-30a8-aefb-ebf1cbfe185e}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\armsha3">
<UniqueIdentifier>{855cc78f-1fe0-3ad2-a2ac-5e2b0c01c235}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\ref">
<UniqueIdentifier>{9462f285-fee0-3779-983b-2811dc621f7d}</UniqueIdentifier>
</Filter>
@@ -193,6 +193,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\keccak1600.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
@@ -356,6 +357,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_armcrypto.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_soft.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
@@ -399,6 +399,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c">
<Filter>crypto_core\salsa\ref</Filter>
</ClCompile>
@@ -884,6 +887,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
<Filter>crypto_core\ed25519\ref10\fe_25_5</Filter>
</ClInclude>
@@ -982,6 +988,9 @@
<Filter Include="crypto_core\keccak1600">
<UniqueIdentifier>{85c1722f-2d65-30a8-aefb-ebf1cbfe185e}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\armsha3">
<UniqueIdentifier>{855cc78f-1fe0-3ad2-a2ac-5e2b0c01c235}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\ref">
<UniqueIdentifier>{9462f285-fee0-3779-983b-2811dc621f7d}</UniqueIdentifier>
</Filter>
@@ -193,6 +193,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\keccak1600.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
@@ -356,6 +357,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_armcrypto.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_soft.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
@@ -399,6 +399,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c">
<Filter>crypto_core\salsa\ref</Filter>
</ClCompile>
@@ -884,6 +887,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
<Filter>crypto_core\ed25519\ref10\fe_25_5</Filter>
</ClInclude>
@@ -982,6 +988,9 @@
<Filter Include="crypto_core\keccak1600">
<UniqueIdentifier>{85c1722f-2d65-30a8-aefb-ebf1cbfe185e}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\armsha3">
<UniqueIdentifier>{855cc78f-1fe0-3ad2-a2ac-5e2b0c01c235}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\ref">
<UniqueIdentifier>{9462f285-fee0-3779-983b-2811dc621f7d}</UniqueIdentifier>
</Filter>
@@ -193,6 +193,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\keccak1600.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
@@ -356,6 +357,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_armcrypto.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_soft.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
@@ -399,6 +399,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c">
<Filter>crypto_core\salsa\ref</Filter>
</ClCompile>
@@ -884,6 +887,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
<Filter>crypto_core\ed25519\ref10\fe_25_5</Filter>
</ClInclude>
@@ -982,6 +988,9 @@
<Filter Include="crypto_core\keccak1600">
<UniqueIdentifier>{85c1722f-2d65-30a8-aefb-ebf1cbfe185e}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\armsha3">
<UniqueIdentifier>{855cc78f-1fe0-3ad2-a2ac-5e2b0c01c235}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\ref">
<UniqueIdentifier>{9462f285-fee0-3779-983b-2811dc621f7d}</UniqueIdentifier>
</Filter>
@@ -193,6 +193,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\keccak1600.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
@@ -356,6 +357,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_armcrypto.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_soft.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
@@ -399,6 +399,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c">
<Filter>crypto_core\salsa\ref</Filter>
</ClCompile>
@@ -884,6 +887,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
<Filter>crypto_core\ed25519\ref10\fe_25_5</Filter>
</ClInclude>
@@ -982,6 +988,9 @@
<Filter Include="crypto_core\keccak1600">
<UniqueIdentifier>{85c1722f-2d65-30a8-aefb-ebf1cbfe185e}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\armsha3">
<UniqueIdentifier>{855cc78f-1fe0-3ad2-a2ac-5e2b0c01c235}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\ref">
<UniqueIdentifier>{9462f285-fee0-3779-983b-2811dc621f7d}</UniqueIdentifier>
</Filter>
@@ -217,6 +217,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\keccak1600.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
@@ -380,6 +381,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_armcrypto.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_soft.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
@@ -399,6 +399,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c">
<Filter>crypto_core\salsa\ref</Filter>
</ClCompile>
@@ -884,6 +887,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
<Filter>crypto_core\ed25519\ref10\fe_25_5</Filter>
</ClInclude>
@@ -982,6 +988,9 @@
<Filter Include="crypto_core\keccak1600">
<UniqueIdentifier>{85c1722f-2d65-30a8-aefb-ebf1cbfe185e}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\armsha3">
<UniqueIdentifier>{855cc78f-1fe0-3ad2-a2ac-5e2b0c01c235}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\ref">
<UniqueIdentifier>{9462f285-fee0-3779-983b-2811dc621f7d}</UniqueIdentifier>
</Filter>
@@ -217,6 +217,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\keccak1600.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
@@ -380,6 +381,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_armcrypto.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_soft.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
@@ -399,6 +399,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c">
<Filter>crypto_core\salsa\ref</Filter>
</ClCompile>
@@ -884,6 +887,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
<Filter>crypto_core\ed25519\ref10\fe_25_5</Filter>
</ClInclude>
@@ -982,6 +988,9 @@
<Filter Include="crypto_core\keccak1600">
<UniqueIdentifier>{85c1722f-2d65-30a8-aefb-ebf1cbfe185e}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\armsha3">
<UniqueIdentifier>{855cc78f-1fe0-3ad2-a2ac-5e2b0c01c235}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\ref">
<UniqueIdentifier>{9462f285-fee0-3779-983b-2811dc621f7d}</UniqueIdentifier>
</Filter>
@@ -217,6 +217,7 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\keccak1600.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
@@ -380,6 +381,7 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_armcrypto.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\aegis256_soft.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
@@ -399,6 +399,9 @@
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c">
<Filter>crypto_core\salsa\ref</Filter>
</ClCompile>
@@ -884,6 +887,9 @@
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h">
<Filter>crypto_core\keccak1600\ref</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h">
<Filter>crypto_core\keccak1600\armsha3</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
<Filter>crypto_core\ed25519\ref10\fe_25_5</Filter>
</ClInclude>
@@ -982,6 +988,9 @@
<Filter Include="crypto_core\keccak1600">
<UniqueIdentifier>{85c1722f-2d65-30a8-aefb-ebf1cbfe185e}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\armsha3">
<UniqueIdentifier>{855cc78f-1fe0-3ad2-a2ac-5e2b0c01c235}</UniqueIdentifier>
</Filter>
<Filter Include="crypto_core\keccak1600\ref">
<UniqueIdentifier>{9462f285-fee0-3779-983b-2811dc621f7d}</UniqueIdentifier>
</Filter>
+2
View File
@@ -441,6 +441,7 @@
<ClCompile Include="..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
<ClCompile Include="..\..\src\libsodium\crypto_core\keccak1600\keccak1600.c" />
<ClCompile Include="..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c" />
<ClCompile Include="..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c" />
<ClCompile Include="..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
<ClCompile Include="..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
<ClCompile Include="..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20.c" />
@@ -604,6 +605,7 @@
<ClInclude Include="..\..\src\libsodium\crypto_aead\aegis256\aegis256_armcrypto.h" />
<ClInclude Include="..\..\src\libsodium\crypto_aead\aegis256\aegis256_soft.h" />
<ClInclude Include="..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h" />
<ClInclude Include="..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h" />
<ClInclude Include="..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h" />
<ClInclude Include="..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\fe.h" />
<ClInclude Include="..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\base2.h" />
+6
View File
@@ -390,6 +390,9 @@
<ClCompile Include="..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -875,6 +878,9 @@
<ClInclude Include="..\..\src\libsodium\crypto_core\keccak1600\ref\keccak1600_ref.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libsodium\crypto_core\keccak1600\armsha3\keccak1600_armsha3.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\libsodium\crypto_core\ed25519\ref10\fe_25_5\constants.h">
<Filter>Header Files</Filter>
</ClInclude>
+2
View File
@@ -30,6 +30,8 @@ libsodium_la_SOURCES = \
crypto_core/keccak1600/keccak1600.c \
crypto_core/keccak1600/ref/keccak1600_ref.c \
crypto_core/keccak1600/ref/keccak1600_ref.h \
crypto_core/keccak1600/armsha3/keccak1600_armsha3.c \
crypto_core/keccak1600/armsha3/keccak1600_armsha3.h \
crypto_core/salsa/ref/core_salsa_ref.c \
crypto_core/softaes/softaes.c \
crypto_generichash/crypto_generichash.c \
+30
View File
@@ -297,6 +297,8 @@ am__libsodium_la_SOURCES_DIST = \
crypto_core/keccak1600/keccak1600.c \
crypto_core/keccak1600/ref/keccak1600_ref.c \
crypto_core/keccak1600/ref/keccak1600_ref.h \
crypto_core/keccak1600/armsha3/keccak1600_armsha3.c \
crypto_core/keccak1600/armsha3/keccak1600_armsha3.h \
crypto_core/salsa/ref/core_salsa_ref.c \
crypto_core/softaes/softaes.c \
crypto_generichash/crypto_generichash.c \
@@ -483,6 +485,7 @@ am_libsodium_la_OBJECTS = \
crypto_core/hsalsa20/libsodium_la-core_hsalsa20.lo \
crypto_core/keccak1600/libsodium_la-keccak1600.lo \
crypto_core/keccak1600/ref/libsodium_la-keccak1600_ref.lo \
crypto_core/keccak1600/armsha3/libsodium_la-keccak1600_armsha3.lo \
crypto_core/salsa/ref/libsodium_la-core_salsa_ref.lo \
crypto_core/softaes/libsodium_la-softaes.lo \
crypto_generichash/libsodium_la-crypto_generichash.lo \
@@ -630,6 +633,7 @@ am__depfiles_remade = crypto_aead/aegis128l/$(DEPDIR)/libaesni_la-aegis128l_aesn
crypto_core/hsalsa20/$(DEPDIR)/libsodium_la-core_hsalsa20.Plo \
crypto_core/hsalsa20/ref2/$(DEPDIR)/libsodium_la-core_hsalsa20_ref2.Plo \
crypto_core/keccak1600/$(DEPDIR)/libsodium_la-keccak1600.Plo \
crypto_core/keccak1600/armsha3/$(DEPDIR)/libsodium_la-keccak1600_armsha3.Plo \
crypto_core/keccak1600/ref/$(DEPDIR)/libsodium_la-keccak1600_ref.Plo \
crypto_core/salsa/ref/$(DEPDIR)/libsodium_la-core_salsa_ref.Plo \
crypto_core/softaes/$(DEPDIR)/libsodium_la-softaes.Plo \
@@ -1044,6 +1048,8 @@ libsodium_la_SOURCES = crypto_aead/aegis128l/aead_aegis128l.c \
crypto_core/keccak1600/keccak1600.c \
crypto_core/keccak1600/ref/keccak1600_ref.c \
crypto_core/keccak1600/ref/keccak1600_ref.h \
crypto_core/keccak1600/armsha3/keccak1600_armsha3.c \
crypto_core/keccak1600/armsha3/keccak1600_armsha3.h \
crypto_core/salsa/ref/core_salsa_ref.c \
crypto_core/softaes/softaes.c \
crypto_generichash/crypto_generichash.c \
@@ -1593,6 +1599,15 @@ crypto_core/keccak1600/ref/$(DEPDIR)/$(am__dirstamp):
crypto_core/keccak1600/ref/libsodium_la-keccak1600_ref.lo: \
crypto_core/keccak1600/ref/$(am__dirstamp) \
crypto_core/keccak1600/ref/$(DEPDIR)/$(am__dirstamp)
crypto_core/keccak1600/armsha3/$(am__dirstamp):
@$(MKDIR_P) crypto_core/keccak1600/armsha3
@: >>crypto_core/keccak1600/armsha3/$(am__dirstamp)
crypto_core/keccak1600/armsha3/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) crypto_core/keccak1600/armsha3/$(DEPDIR)
@: >>crypto_core/keccak1600/armsha3/$(DEPDIR)/$(am__dirstamp)
crypto_core/keccak1600/armsha3/libsodium_la-keccak1600_armsha3.lo: \
crypto_core/keccak1600/armsha3/$(am__dirstamp) \
crypto_core/keccak1600/armsha3/$(DEPDIR)/$(am__dirstamp)
crypto_core/salsa/ref/$(am__dirstamp):
@$(MKDIR_P) crypto_core/salsa/ref
@: >>crypto_core/salsa/ref/$(am__dirstamp)
@@ -2315,6 +2330,8 @@ mostlyclean-compile:
-rm -f crypto_core/hsalsa20/ref2/*.lo
-rm -f crypto_core/keccak1600/*.$(OBJEXT)
-rm -f crypto_core/keccak1600/*.lo
-rm -f crypto_core/keccak1600/armsha3/*.$(OBJEXT)
-rm -f crypto_core/keccak1600/armsha3/*.lo
-rm -f crypto_core/keccak1600/ref/*.$(OBJEXT)
-rm -f crypto_core/keccak1600/ref/*.lo
-rm -f crypto_core/salsa/ref/*.$(OBJEXT)
@@ -2485,6 +2502,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@crypto_core/hsalsa20/$(DEPDIR)/libsodium_la-core_hsalsa20.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@crypto_core/hsalsa20/ref2/$(DEPDIR)/libsodium_la-core_hsalsa20_ref2.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@crypto_core/keccak1600/$(DEPDIR)/libsodium_la-keccak1600.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@crypto_core/keccak1600/armsha3/$(DEPDIR)/libsodium_la-keccak1600_armsha3.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@crypto_core/keccak1600/ref/$(DEPDIR)/libsodium_la-keccak1600_ref.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@crypto_core/salsa/ref/$(DEPDIR)/libsodium_la-core_salsa_ref.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@crypto_core/softaes/$(DEPDIR)/libsodium_la-softaes.Plo@am__quote@ # am--include-marker
@@ -2904,6 +2922,13 @@ crypto_core/keccak1600/ref/libsodium_la-keccak1600_ref.lo: crypto_core/keccak160
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_core/keccak1600/ref/libsodium_la-keccak1600_ref.lo `test -f 'crypto_core/keccak1600/ref/keccak1600_ref.c' || echo '$(srcdir)/'`crypto_core/keccak1600/ref/keccak1600_ref.c
crypto_core/keccak1600/armsha3/libsodium_la-keccak1600_armsha3.lo: crypto_core/keccak1600/armsha3/keccak1600_armsha3.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_core/keccak1600/armsha3/libsodium_la-keccak1600_armsha3.lo -MD -MP -MF crypto_core/keccak1600/armsha3/$(DEPDIR)/libsodium_la-keccak1600_armsha3.Tpo -c -o crypto_core/keccak1600/armsha3/libsodium_la-keccak1600_armsha3.lo `test -f 'crypto_core/keccak1600/armsha3/keccak1600_armsha3.c' || echo '$(srcdir)/'`crypto_core/keccak1600/armsha3/keccak1600_armsha3.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_core/keccak1600/armsha3/$(DEPDIR)/libsodium_la-keccak1600_armsha3.Tpo crypto_core/keccak1600/armsha3/$(DEPDIR)/libsodium_la-keccak1600_armsha3.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_core/keccak1600/armsha3/keccak1600_armsha3.c' object='crypto_core/keccak1600/armsha3/libsodium_la-keccak1600_armsha3.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_core/keccak1600/armsha3/libsodium_la-keccak1600_armsha3.lo `test -f 'crypto_core/keccak1600/armsha3/keccak1600_armsha3.c' || echo '$(srcdir)/'`crypto_core/keccak1600/armsha3/keccak1600_armsha3.c
crypto_core/salsa/ref/libsodium_la-core_salsa_ref.lo: crypto_core/salsa/ref/core_salsa_ref.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_core/salsa/ref/libsodium_la-core_salsa_ref.lo -MD -MP -MF crypto_core/salsa/ref/$(DEPDIR)/libsodium_la-core_salsa_ref.Tpo -c -o crypto_core/salsa/ref/libsodium_la-core_salsa_ref.lo `test -f 'crypto_core/salsa/ref/core_salsa_ref.c' || echo '$(srcdir)/'`crypto_core/salsa/ref/core_salsa_ref.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_core/salsa/ref/$(DEPDIR)/libsodium_la-core_salsa_ref.Tpo crypto_core/salsa/ref/$(DEPDIR)/libsodium_la-core_salsa_ref.Plo
@@ -3615,6 +3640,7 @@ clean-libtool:
-rm -rf crypto_core/hsalsa20/.libs crypto_core/hsalsa20/_libs
-rm -rf crypto_core/hsalsa20/ref2/.libs crypto_core/hsalsa20/ref2/_libs
-rm -rf crypto_core/keccak1600/.libs crypto_core/keccak1600/_libs
-rm -rf crypto_core/keccak1600/armsha3/.libs crypto_core/keccak1600/armsha3/_libs
-rm -rf crypto_core/keccak1600/ref/.libs crypto_core/keccak1600/ref/_libs
-rm -rf crypto_core/salsa/ref/.libs crypto_core/salsa/ref/_libs
-rm -rf crypto_core/softaes/.libs crypto_core/softaes/_libs
@@ -3937,6 +3963,8 @@ distclean-generic:
-$(am__rm_f) crypto_core/hsalsa20/ref2/$(am__dirstamp)
-$(am__rm_f) crypto_core/keccak1600/$(DEPDIR)/$(am__dirstamp)
-$(am__rm_f) crypto_core/keccak1600/$(am__dirstamp)
-$(am__rm_f) crypto_core/keccak1600/armsha3/$(DEPDIR)/$(am__dirstamp)
-$(am__rm_f) crypto_core/keccak1600/armsha3/$(am__dirstamp)
-$(am__rm_f) crypto_core/keccak1600/ref/$(DEPDIR)/$(am__dirstamp)
-$(am__rm_f) crypto_core/keccak1600/ref/$(am__dirstamp)
-$(am__rm_f) crypto_core/salsa/ref/$(DEPDIR)/$(am__dirstamp)
@@ -4113,6 +4141,7 @@ distclean: distclean-recursive
-rm -f crypto_core/hsalsa20/$(DEPDIR)/libsodium_la-core_hsalsa20.Plo
-rm -f crypto_core/hsalsa20/ref2/$(DEPDIR)/libsodium_la-core_hsalsa20_ref2.Plo
-rm -f crypto_core/keccak1600/$(DEPDIR)/libsodium_la-keccak1600.Plo
-rm -f crypto_core/keccak1600/armsha3/$(DEPDIR)/libsodium_la-keccak1600_armsha3.Plo
-rm -f crypto_core/keccak1600/ref/$(DEPDIR)/libsodium_la-keccak1600_ref.Plo
-rm -f crypto_core/salsa/ref/$(DEPDIR)/libsodium_la-core_salsa_ref.Plo
-rm -f crypto_core/softaes/$(DEPDIR)/libsodium_la-softaes.Plo
@@ -4293,6 +4322,7 @@ maintainer-clean: maintainer-clean-recursive
-rm -f crypto_core/hsalsa20/$(DEPDIR)/libsodium_la-core_hsalsa20.Plo
-rm -f crypto_core/hsalsa20/ref2/$(DEPDIR)/libsodium_la-core_hsalsa20_ref2.Plo
-rm -f crypto_core/keccak1600/$(DEPDIR)/libsodium_la-keccak1600.Plo
-rm -f crypto_core/keccak1600/armsha3/$(DEPDIR)/libsodium_la-keccak1600_armsha3.Plo
-rm -f crypto_core/keccak1600/ref/$(DEPDIR)/libsodium_la-keccak1600_ref.Plo
-rm -f crypto_core/salsa/ref/$(DEPDIR)/libsodium_la-core_salsa_ref.Plo
-rm -f crypto_core/softaes/$(DEPDIR)/libsodium_la-softaes.Plo
@@ -0,0 +1,276 @@
#include <stdint.h>
#include <string.h>
#include "keccak1600_armsha3.h"
#include "private/common.h"
#if defined(__ARM_FEATURE_SHA3)
#include <arm_neon.h>
#ifdef __clang__
# pragma clang attribute push(__attribute__((target("neon,sha3"))), apply_to = function)
#elif defined(__GNUC__)
# pragma GCC target("+simd+sha3")
#endif
#define KECCAK1600_STATEBYTES 200
static const uint64_t RC[24] = {
0x0000000000000001ULL, 0x0000000000008082ULL, 0x800000000000808aULL, 0x8000000080008000ULL,
0x000000000000808bULL, 0x0000000080000001ULL, 0x8000000080008081ULL, 0x8000000000008009ULL,
0x000000000000008aULL, 0x0000000000000088ULL, 0x0000000080008009ULL, 0x000000008000000aULL,
0x000000008000808bULL, 0x800000000000008bULL, 0x8000000000008089ULL, 0x8000000000008003ULL,
0x8000000000008002ULL, 0x8000000000000080ULL, 0x000000000000800aULL, 0x800000008000000aULL,
0x8000000080008081ULL, 0x8000000000008080ULL, 0x0000000080000001ULL, 0x8000000080008008ULL
};
#define ROUND(A, E, rc_idx) \
do { \
uint64x2_t rc = vdupq_n_u64(RC[rc_idx]); \
Ca = veor3q_u64(A##ba, veor3q_u64(A##ga, A##ka, A##ma), A##sa); \
Ce = veor3q_u64(A##be, veor3q_u64(A##ge, A##ke, A##me), A##se); \
Ci = veor3q_u64(A##bi, veor3q_u64(A##gi, A##ki, A##mi), A##si); \
Co = veor3q_u64(A##bo, veor3q_u64(A##go, A##ko, A##mo), A##so); \
Cu = veor3q_u64(A##bu, veor3q_u64(A##gu, A##ku, A##mu), A##su); \
Da = vrax1q_u64(Cu, Ce); \
De = vrax1q_u64(Ca, Ci); \
Di = vrax1q_u64(Ce, Co); \
Do = vrax1q_u64(Ci, Cu); \
Du = vrax1q_u64(Co, Ca); \
Ba = veorq_u64(A##ba, Da); \
Be = vxarq_u64(A##ge, De, 64 - 44); \
Bi = vxarq_u64(A##ki, Di, 64 - 43); \
Bo = vxarq_u64(A##mo, Do, 64 - 21); \
Bu = vxarq_u64(A##su, Du, 64 - 14); \
E##ba = veorq_u64(vbcaxq_u64(Ba, Bi, Be), rc); \
E##be = vbcaxq_u64(Be, Bo, Bi); \
E##bi = vbcaxq_u64(Bi, Bu, Bo); \
E##bo = vbcaxq_u64(Bo, Ba, Bu); \
E##bu = vbcaxq_u64(Bu, Be, Ba); \
Ba = vxarq_u64(A##bo, Do, 64 - 28); \
Be = vxarq_u64(A##gu, Du, 64 - 20); \
Bi = vxarq_u64(A##ka, Da, 64 - 3); \
Bo = vxarq_u64(A##me, De, 64 - 45); \
Bu = vxarq_u64(A##si, Di, 64 - 61); \
E##ga = vbcaxq_u64(Ba, Bi, Be); \
E##ge = vbcaxq_u64(Be, Bo, Bi); \
E##gi = vbcaxq_u64(Bi, Bu, Bo); \
E##go = vbcaxq_u64(Bo, Ba, Bu); \
E##gu = vbcaxq_u64(Bu, Be, Ba); \
Ba = vxarq_u64(A##be, De, 64 - 1); \
Be = vxarq_u64(A##gi, Di, 64 - 6); \
Bi = vxarq_u64(A##ko, Do, 64 - 25); \
Bo = vxarq_u64(A##mu, Du, 64 - 8); \
Bu = vxarq_u64(A##sa, Da, 64 - 18); \
E##ka = vbcaxq_u64(Ba, Bi, Be); \
E##ke = vbcaxq_u64(Be, Bo, Bi); \
E##ki = vbcaxq_u64(Bi, Bu, Bo); \
E##ko = vbcaxq_u64(Bo, Ba, Bu); \
E##ku = vbcaxq_u64(Bu, Be, Ba); \
Ba = vxarq_u64(A##bu, Du, 64 - 27); \
Be = vxarq_u64(A##ga, Da, 64 - 36); \
Bi = vxarq_u64(A##ke, De, 64 - 10); \
Bo = vxarq_u64(A##mi, Di, 64 - 15); \
Bu = vxarq_u64(A##so, Do, 64 - 56); \
E##ma = vbcaxq_u64(Ba, Bi, Be); \
E##me = vbcaxq_u64(Be, Bo, Bi); \
E##mi = vbcaxq_u64(Bi, Bu, Bo); \
E##mo = vbcaxq_u64(Bo, Ba, Bu); \
E##mu = vbcaxq_u64(Bu, Be, Ba); \
Ba = vxarq_u64(A##bi, Di, 64 - 62); \
Be = vxarq_u64(A##go, Do, 64 - 55); \
Bi = vxarq_u64(A##ku, Du, 64 - 39); \
Bo = vxarq_u64(A##ma, Da, 64 - 41); \
Bu = vxarq_u64(A##se, De, 64 - 2); \
E##sa = vbcaxq_u64(Ba, Bi, Be); \
E##se = vbcaxq_u64(Be, Bo, Bi); \
E##si = vbcaxq_u64(Bi, Bu, Bo); \
E##so = vbcaxq_u64(Bo, Ba, Bu); \
E##su = vbcaxq_u64(Bu, Be, Ba); \
} while (0)
static void
keccakf_24_rounds(uint64_t st[25])
{
uint64x2_t Aba, Abe, Abi, Abo, Abu;
uint64x2_t Aga, Age, Agi, Ago, Agu;
uint64x2_t Aka, Ake, Aki, Ako, Aku;
uint64x2_t Ama, Ame, Ami, Amo, Amu;
uint64x2_t Asa, Ase, Asi, Aso, Asu;
uint64x2_t Eba, Ebe, Ebi, Ebo, Ebu;
uint64x2_t Ega, Ege, Egi, Ego, Egu;
uint64x2_t Eka, Eke, Eki, Eko, Eku;
uint64x2_t Ema, Eme, Emi, Emo, Emu;
uint64x2_t Esa, Ese, Esi, Eso, Esu;
uint64x2_t Ca, Ce, Ci, Co, Cu;
uint64x2_t Da, De, Di, Do, Du;
uint64x2_t Ba, Be, Bi, Bo, Bu;
Aba = vdupq_n_u64(st[0]); Abe = vdupq_n_u64(st[1]);
Abi = vdupq_n_u64(st[2]); Abo = vdupq_n_u64(st[3]);
Abu = vdupq_n_u64(st[4]);
Aga = vdupq_n_u64(st[5]); Age = vdupq_n_u64(st[6]);
Agi = vdupq_n_u64(st[7]); Ago = vdupq_n_u64(st[8]);
Agu = vdupq_n_u64(st[9]);
Aka = vdupq_n_u64(st[10]); Ake = vdupq_n_u64(st[11]);
Aki = vdupq_n_u64(st[12]); Ako = vdupq_n_u64(st[13]);
Aku = vdupq_n_u64(st[14]);
Ama = vdupq_n_u64(st[15]); Ame = vdupq_n_u64(st[16]);
Ami = vdupq_n_u64(st[17]); Amo = vdupq_n_u64(st[18]);
Amu = vdupq_n_u64(st[19]);
Asa = vdupq_n_u64(st[20]); Ase = vdupq_n_u64(st[21]);
Asi = vdupq_n_u64(st[22]); Aso = vdupq_n_u64(st[23]);
Asu = vdupq_n_u64(st[24]);
ROUND(A, E, 0); ROUND(E, A, 1);
ROUND(A, E, 2); ROUND(E, A, 3);
ROUND(A, E, 4); ROUND(E, A, 5);
ROUND(A, E, 6); ROUND(E, A, 7);
ROUND(A, E, 8); ROUND(E, A, 9);
ROUND(A, E, 10); ROUND(E, A, 11);
ROUND(A, E, 12); ROUND(E, A, 13);
ROUND(A, E, 14); ROUND(E, A, 15);
ROUND(A, E, 16); ROUND(E, A, 17);
ROUND(A, E, 18); ROUND(E, A, 19);
ROUND(A, E, 20); ROUND(E, A, 21);
ROUND(A, E, 22); ROUND(E, A, 23);
st[0] = vgetq_lane_u64(Aba, 0); st[1] = vgetq_lane_u64(Abe, 0);
st[2] = vgetq_lane_u64(Abi, 0); st[3] = vgetq_lane_u64(Abo, 0);
st[4] = vgetq_lane_u64(Abu, 0);
st[5] = vgetq_lane_u64(Aga, 0); st[6] = vgetq_lane_u64(Age, 0);
st[7] = vgetq_lane_u64(Agi, 0); st[8] = vgetq_lane_u64(Ago, 0);
st[9] = vgetq_lane_u64(Agu, 0);
st[10] = vgetq_lane_u64(Aka, 0); st[11] = vgetq_lane_u64(Ake, 0);
st[12] = vgetq_lane_u64(Aki, 0); st[13] = vgetq_lane_u64(Ako, 0);
st[14] = vgetq_lane_u64(Aku, 0);
st[15] = vgetq_lane_u64(Ama, 0); st[16] = vgetq_lane_u64(Ame, 0);
st[17] = vgetq_lane_u64(Ami, 0); st[18] = vgetq_lane_u64(Amo, 0);
st[19] = vgetq_lane_u64(Amu, 0);
st[20] = vgetq_lane_u64(Asa, 0); st[21] = vgetq_lane_u64(Ase, 0);
st[22] = vgetq_lane_u64(Asi, 0); st[23] = vgetq_lane_u64(Aso, 0);
st[24] = vgetq_lane_u64(Asu, 0);
}
static void
keccakf_12_rounds(uint64_t st[25])
{
uint64x2_t Aba, Abe, Abi, Abo, Abu;
uint64x2_t Aga, Age, Agi, Ago, Agu;
uint64x2_t Aka, Ake, Aki, Ako, Aku;
uint64x2_t Ama, Ame, Ami, Amo, Amu;
uint64x2_t Asa, Ase, Asi, Aso, Asu;
uint64x2_t Eba, Ebe, Ebi, Ebo, Ebu;
uint64x2_t Ega, Ege, Egi, Ego, Egu;
uint64x2_t Eka, Eke, Eki, Eko, Eku;
uint64x2_t Ema, Eme, Emi, Emo, Emu;
uint64x2_t Esa, Ese, Esi, Eso, Esu;
uint64x2_t Ca, Ce, Ci, Co, Cu;
uint64x2_t Da, De, Di, Do, Du;
uint64x2_t Ba, Be, Bi, Bo, Bu;
Aba = vdupq_n_u64(st[0]); Abe = vdupq_n_u64(st[1]);
Abi = vdupq_n_u64(st[2]); Abo = vdupq_n_u64(st[3]);
Abu = vdupq_n_u64(st[4]);
Aga = vdupq_n_u64(st[5]); Age = vdupq_n_u64(st[6]);
Agi = vdupq_n_u64(st[7]); Ago = vdupq_n_u64(st[8]);
Agu = vdupq_n_u64(st[9]);
Aka = vdupq_n_u64(st[10]); Ake = vdupq_n_u64(st[11]);
Aki = vdupq_n_u64(st[12]); Ako = vdupq_n_u64(st[13]);
Aku = vdupq_n_u64(st[14]);
Ama = vdupq_n_u64(st[15]); Ame = vdupq_n_u64(st[16]);
Ami = vdupq_n_u64(st[17]); Amo = vdupq_n_u64(st[18]);
Amu = vdupq_n_u64(st[19]);
Asa = vdupq_n_u64(st[20]); Ase = vdupq_n_u64(st[21]);
Asi = vdupq_n_u64(st[22]); Aso = vdupq_n_u64(st[23]);
Asu = vdupq_n_u64(st[24]);
ROUND(A, E, 12); ROUND(E, A, 13);
ROUND(A, E, 14); ROUND(E, A, 15);
ROUND(A, E, 16); ROUND(E, A, 17);
ROUND(A, E, 18); ROUND(E, A, 19);
ROUND(A, E, 20); ROUND(E, A, 21);
ROUND(A, E, 22); ROUND(E, A, 23);
st[0] = vgetq_lane_u64(Aba, 0); st[1] = vgetq_lane_u64(Abe, 0);
st[2] = vgetq_lane_u64(Abi, 0); st[3] = vgetq_lane_u64(Abo, 0);
st[4] = vgetq_lane_u64(Abu, 0);
st[5] = vgetq_lane_u64(Aga, 0); st[6] = vgetq_lane_u64(Age, 0);
st[7] = vgetq_lane_u64(Agi, 0); st[8] = vgetq_lane_u64(Ago, 0);
st[9] = vgetq_lane_u64(Agu, 0);
st[10] = vgetq_lane_u64(Aka, 0); st[11] = vgetq_lane_u64(Ake, 0);
st[12] = vgetq_lane_u64(Aki, 0); st[13] = vgetq_lane_u64(Ako, 0);
st[14] = vgetq_lane_u64(Aku, 0);
st[15] = vgetq_lane_u64(Ama, 0); st[16] = vgetq_lane_u64(Ame, 0);
st[17] = vgetq_lane_u64(Ami, 0); st[18] = vgetq_lane_u64(Amo, 0);
st[19] = vgetq_lane_u64(Amu, 0);
st[20] = vgetq_lane_u64(Asa, 0); st[21] = vgetq_lane_u64(Ase, 0);
st[22] = vgetq_lane_u64(Asi, 0); st[23] = vgetq_lane_u64(Aso, 0);
st[24] = vgetq_lane_u64(Asu, 0);
}
void
keccak1600_armsha3_permute_24(void *state)
{
uint64_t st[25];
unsigned int i;
for (i = 0U; i < 25U; i++) {
st[i] = LOAD64_LE((const unsigned char *) state + i * 8U);
}
keccakf_24_rounds(st);
for (i = 0U; i < 25U; i++) {
STORE64_LE((unsigned char *) state + i * 8U, st[i]);
}
}
void
keccak1600_armsha3_permute_12(void *state)
{
uint64_t st[25];
unsigned int i;
for (i = 0U; i < 25U; i++) {
st[i] = LOAD64_LE((const unsigned char *) state + i * 8U);
}
keccakf_12_rounds(st);
for (i = 0U; i < 25U; i++) {
STORE64_LE((unsigned char *) state + i * 8U, st[i]);
}
}
void
keccak1600_armsha3_init(void *state)
{
memset(state, 0, KECCAK1600_STATEBYTES);
}
void
keccak1600_armsha3_xor_bytes(void *state, const unsigned char *data, size_t offset, size_t length)
{
unsigned char *st = (unsigned char *) state;
size_t i;
for (i = 0U; i < length; i++) {
st[offset + i] ^= data[i];
}
}
void
keccak1600_armsha3_extract_bytes(const void *state, unsigned char *data, size_t offset, size_t length)
{
const unsigned char *st = (const unsigned char *) state;
memcpy(data, st + offset, length);
}
#ifdef __clang__
# pragma clang attribute pop
#endif
#endif /* __ARM_FEATURE_SHA3 */
@@ -0,0 +1,20 @@
#ifndef keccak1600_armsha3_H
#define keccak1600_armsha3_H
#include <stddef.h>
#include "private/quirks.h"
void keccak1600_armsha3_init(void *state);
void keccak1600_armsha3_xor_bytes(void *state, const unsigned char *bytes,
size_t offset, size_t length);
void keccak1600_armsha3_extract_bytes(const void *state, unsigned char *bytes,
size_t offset, size_t length);
void keccak1600_armsha3_permute_24(void *state);
void keccak1600_armsha3_permute_12(void *state);
#endif /* keccak1600_armsha3_H */
@@ -1,6 +1,21 @@
#include "crypto_core_keccak1600.h"
#include "ref/keccak1600_ref.h"
#ifdef __ARM_FEATURE_SHA3
# include "armsha3/keccak1600_armsha3.h"
# define keccak1600_init keccak1600_armsha3_init
# define keccak1600_xor_bytes keccak1600_armsha3_xor_bytes
# define keccak1600_extract_bytes keccak1600_armsha3_extract_bytes
# define keccak1600_permute_24 keccak1600_armsha3_permute_24
# define keccak1600_permute_12 keccak1600_armsha3_permute_12
#else
# define keccak1600_init keccak1600_ref_init
# define keccak1600_xor_bytes keccak1600_ref_xor_bytes
# define keccak1600_extract_bytes keccak1600_ref_extract_bytes
# define keccak1600_permute_24 keccak1600_ref_permute_24
# define keccak1600_permute_12 keccak1600_ref_permute_12
#endif
size_t
crypto_core_keccak1600_statebytes(void)
{
@@ -10,7 +25,7 @@ crypto_core_keccak1600_statebytes(void)
void
crypto_core_keccak1600_init(crypto_core_keccak1600_state *state)
{
keccak1600_ref_init(state->opaque);
keccak1600_init(state->opaque);
}
void
@@ -18,7 +33,7 @@ crypto_core_keccak1600_xor_bytes(crypto_core_keccak1600_state *state,
const unsigned char *bytes, size_t offset,
size_t length)
{
keccak1600_ref_xor_bytes(state->opaque, bytes, offset, length);
keccak1600_xor_bytes(state->opaque, bytes, offset, length);
}
void
@@ -26,17 +41,17 @@ crypto_core_keccak1600_extract_bytes(const crypto_core_keccak1600_state *state,
unsigned char *bytes, size_t offset,
size_t length)
{
keccak1600_ref_extract_bytes(state->opaque, bytes, offset, length);
keccak1600_extract_bytes(state->opaque, bytes, offset, length);
}
void
crypto_core_keccak1600_permute_24(crypto_core_keccak1600_state *state)
{
keccak1600_ref_permute_24(state->opaque);
keccak1600_permute_24(state->opaque);
}
void
crypto_core_keccak1600_permute_12(crypto_core_keccak1600_state *state)
{
keccak1600_ref_permute_12(state->opaque);
keccak1600_permute_12(state->opaque);
}
@@ -3,6 +3,11 @@
#ifndef quirks_H
#ifndef NO_QUIRKS
#define keccak1600_armsha3_extract_bytes _sodium_keccak1600_armsha3_extract_bytes
#define keccak1600_armsha3_init _sodium_keccak1600_armsha3_init
#define keccak1600_armsha3_permute_12 _sodium_keccak1600_armsha3_permute_12
#define keccak1600_armsha3_permute_24 _sodium_keccak1600_armsha3_permute_24
#define keccak1600_armsha3_xor_bytes _sodium_keccak1600_armsha3_xor_bytes
#define keccak1600_ref_extract_bytes _sodium_keccak1600_ref_extract_bytes
#define keccak1600_ref_init _sodium_keccak1600_ref_init
#define keccak1600_ref_permute_12 _sodium_keccak1600_ref_permute_12