From f6c18801a8a9be6a1bef4af177098b8de88f7880 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 22 Jan 2026 10:42:14 +0100 Subject: [PATCH] Add WASM SIMD implementations of Argon2 --- .../msvc/vs2010/libsodium/libsodium.vcxproj | 3 +- .../libsodium/libsodium.vcxproj.filters | 9 +- .../msvc/vs2012/libsodium/libsodium.vcxproj | 3 +- .../libsodium/libsodium.vcxproj.filters | 9 +- .../msvc/vs2013/libsodium/libsodium.vcxproj | 3 +- .../libsodium/libsodium.vcxproj.filters | 9 +- .../msvc/vs2015/libsodium/libsodium.vcxproj | 3 +- .../libsodium/libsodium.vcxproj.filters | 9 +- .../msvc/vs2017/libsodium/libsodium.vcxproj | 3 +- .../libsodium/libsodium.vcxproj.filters | 9 +- .../msvc/vs2019/libsodium/libsodium.vcxproj | 3 +- .../libsodium/libsodium.vcxproj.filters | 9 +- .../msvc/vs2022/libsodium/libsodium.vcxproj | 3 +- .../libsodium/libsodium.vcxproj.filters | 9 +- .../msvc/vs2026/libsodium/libsodium.vcxproj | 3 +- .../libsodium/libsodium.vcxproj.filters | 9 +- ci/appveyor/libsodium.vcxproj | 3 +- ci/appveyor/libsodium.vcxproj.filters | 9 +- src/libsodium/Makefile.am | 2 + src/libsodium/Makefile.in | 19 ++ .../crypto_pwhash/argon2/argon2-core.c | 4 + .../crypto_pwhash/argon2/argon2-core.h | 2 + .../argon2/argon2-fill-block-wasm32.c | 214 ++++++++++++++++++ .../argon2/blamka-round-wasm32.h | 134 +++++++++++ 24 files changed, 447 insertions(+), 36 deletions(-) create mode 100644 src/libsodium/crypto_pwhash/argon2/argon2-fill-block-wasm32.c create mode 100644 src/libsodium/crypto_pwhash/argon2/blamka-round-wasm32.h diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index 7d559a49..d5e2dccc 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -89,6 +89,7 @@ + @@ -220,7 +221,6 @@ - @@ -298,6 +298,7 @@ + diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters index d9cdb10e..cf1114a5 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -87,6 +87,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 @@ -476,9 +479,6 @@ include\sodium - - include\sodium - include\sodium @@ -710,6 +710,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index 37ab8bca..ec920874 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -89,6 +89,7 @@ + @@ -220,7 +221,6 @@ - @@ -298,6 +298,7 @@ + diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters index d9cdb10e..cf1114a5 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters @@ -87,6 +87,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 @@ -476,9 +479,6 @@ include\sodium - - include\sodium - include\sodium @@ -710,6 +710,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index 52aaa48c..a0c65ff0 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -89,6 +89,7 @@ + @@ -220,7 +221,6 @@ - @@ -298,6 +298,7 @@ + diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters index d9cdb10e..cf1114a5 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -87,6 +87,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 @@ -476,9 +479,6 @@ include\sodium - - include\sodium - include\sodium @@ -710,6 +710,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj index 2c4322ce..b2162b55 100644 --- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj @@ -89,6 +89,7 @@ + @@ -220,7 +221,6 @@ - @@ -298,6 +298,7 @@ + diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters index d9cdb10e..cf1114a5 100644 --- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters @@ -87,6 +87,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 @@ -476,9 +479,6 @@ include\sodium - - include\sodium - include\sodium @@ -710,6 +710,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj index 91c52669..eb722c73 100644 --- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj @@ -89,6 +89,7 @@ + @@ -220,7 +221,6 @@ - @@ -298,6 +298,7 @@ + diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters index d9cdb10e..cf1114a5 100644 --- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters @@ -87,6 +87,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 @@ -476,9 +479,6 @@ include\sodium - - include\sodium - include\sodium @@ -710,6 +710,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj b/builds/msvc/vs2019/libsodium/libsodium.vcxproj index 27bdfd74..0f784304 100644 --- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj @@ -113,6 +113,7 @@ + @@ -244,7 +245,6 @@ - @@ -322,6 +322,7 @@ + diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters index d9cdb10e..cf1114a5 100644 --- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters @@ -87,6 +87,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 @@ -476,9 +479,6 @@ include\sodium - - include\sodium - include\sodium @@ -710,6 +710,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 diff --git a/builds/msvc/vs2022/libsodium/libsodium.vcxproj b/builds/msvc/vs2022/libsodium/libsodium.vcxproj index 36218321..5713e10e 100644 --- a/builds/msvc/vs2022/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2022/libsodium/libsodium.vcxproj @@ -113,6 +113,7 @@ + @@ -244,7 +245,6 @@ - @@ -322,6 +322,7 @@ + diff --git a/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters index d9cdb10e..cf1114a5 100644 --- a/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters @@ -87,6 +87,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 @@ -476,9 +479,6 @@ include\sodium - - include\sodium - include\sodium @@ -710,6 +710,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 diff --git a/builds/msvc/vs2026/libsodium/libsodium.vcxproj b/builds/msvc/vs2026/libsodium/libsodium.vcxproj index 6441c293..af1061a1 100644 --- a/builds/msvc/vs2026/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2026/libsodium/libsodium.vcxproj @@ -113,6 +113,7 @@ + @@ -244,7 +245,6 @@ - @@ -322,6 +322,7 @@ + diff --git a/builds/msvc/vs2026/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2026/libsodium/libsodium.vcxproj.filters index d9cdb10e..cf1114a5 100644 --- a/builds/msvc/vs2026/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2026/libsodium/libsodium.vcxproj.filters @@ -87,6 +87,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 @@ -476,9 +479,6 @@ include\sodium - - include\sodium - include\sodium @@ -710,6 +710,9 @@ crypto_pwhash\argon2 + + crypto_pwhash\argon2 + crypto_pwhash\argon2 diff --git a/ci/appveyor/libsodium.vcxproj b/ci/appveyor/libsodium.vcxproj index 24bbd7a6..101709d6 100644 --- a/ci/appveyor/libsodium.vcxproj +++ b/ci/appveyor/libsodium.vcxproj @@ -337,6 +337,7 @@ + @@ -468,7 +469,6 @@ - @@ -546,6 +546,7 @@ + diff --git a/ci/appveyor/libsodium.vcxproj.filters b/ci/appveyor/libsodium.vcxproj.filters index eeafd642..351b6da4 100644 --- a/ci/appveyor/libsodium.vcxproj.filters +++ b/ci/appveyor/libsodium.vcxproj.filters @@ -78,6 +78,9 @@ Source Files + + Source Files + Source Files @@ -467,9 +470,6 @@ Header Files - - Header Files - Header Files @@ -701,6 +701,9 @@ Header Files + + Header Files + Header Files diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 6de2bd03..2746a94e 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -69,11 +69,13 @@ libsodium_la_SOURCES = \ crypto_pwhash/argon2/argon2-encoding.c \ crypto_pwhash/argon2/argon2-encoding.h \ crypto_pwhash/argon2/argon2-fill-block-ref.c \ + crypto_pwhash/argon2/argon2-fill-block-wasm32.c \ crypto_pwhash/argon2/argon2.c \ crypto_pwhash/argon2/argon2.h \ crypto_pwhash/argon2/blake2b-long.c \ crypto_pwhash/argon2/blake2b-long.h \ crypto_pwhash/argon2/blamka-round-ref.h \ + crypto_pwhash/argon2/blamka-round-wasm32.h \ crypto_pwhash/argon2/pwhash_argon2i.c \ crypto_pwhash/argon2/pwhash_argon2id.c \ crypto_pwhash/crypto_pwhash.c \ diff --git a/src/libsodium/Makefile.in b/src/libsodium/Makefile.in index 7607acdf..47f70946 100644 --- a/src/libsodium/Makefile.in +++ b/src/libsodium/Makefile.in @@ -331,10 +331,12 @@ am__libsodium_la_SOURCES_DIST = \ crypto_pwhash/argon2/argon2-encoding.c \ crypto_pwhash/argon2/argon2-encoding.h \ crypto_pwhash/argon2/argon2-fill-block-ref.c \ + crypto_pwhash/argon2/argon2-fill-block-wasm32.c \ crypto_pwhash/argon2/argon2.c crypto_pwhash/argon2/argon2.h \ crypto_pwhash/argon2/blake2b-long.c \ crypto_pwhash/argon2/blake2b-long.h \ crypto_pwhash/argon2/blamka-round-ref.h \ + crypto_pwhash/argon2/blamka-round-wasm32.h \ crypto_pwhash/argon2/pwhash_argon2i.c \ crypto_pwhash/argon2/pwhash_argon2id.c \ crypto_pwhash/crypto_pwhash.c \ @@ -511,6 +513,7 @@ am_libsodium_la_OBJECTS = \ crypto_pwhash/argon2/libsodium_la-argon2-core.lo \ crypto_pwhash/argon2/libsodium_la-argon2-encoding.lo \ crypto_pwhash/argon2/libsodium_la-argon2-fill-block-ref.lo \ + crypto_pwhash/argon2/libsodium_la-argon2-fill-block-wasm32.lo \ crypto_pwhash/argon2/libsodium_la-argon2.lo \ crypto_pwhash/argon2/libsodium_la-blake2b-long.lo \ crypto_pwhash/argon2/libsodium_la-pwhash_argon2i.lo \ @@ -669,6 +672,7 @@ am__depfiles_remade = crypto_aead/aegis128l/$(DEPDIR)/libaesni_la-aegis128l_aesn crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Plo \ crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-encoding.Plo \ crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-ref.Plo \ + crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-wasm32.Plo \ crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2.Plo \ crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-blake2b-long.Plo \ crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-pwhash_argon2i.Plo \ @@ -1082,10 +1086,12 @@ libsodium_la_SOURCES = crypto_aead/aegis128l/aead_aegis128l.c \ crypto_pwhash/argon2/argon2-encoding.c \ crypto_pwhash/argon2/argon2-encoding.h \ crypto_pwhash/argon2/argon2-fill-block-ref.c \ + crypto_pwhash/argon2/argon2-fill-block-wasm32.c \ crypto_pwhash/argon2/argon2.c crypto_pwhash/argon2/argon2.h \ crypto_pwhash/argon2/blake2b-long.c \ crypto_pwhash/argon2/blake2b-long.h \ crypto_pwhash/argon2/blamka-round-ref.h \ + crypto_pwhash/argon2/blamka-round-wasm32.h \ crypto_pwhash/argon2/pwhash_argon2i.c \ crypto_pwhash/argon2/pwhash_argon2id.c \ crypto_pwhash/crypto_pwhash.c \ @@ -1776,6 +1782,9 @@ crypto_pwhash/argon2/libsodium_la-argon2-encoding.lo: \ crypto_pwhash/argon2/libsodium_la-argon2-fill-block-ref.lo: \ crypto_pwhash/argon2/$(am__dirstamp) \ crypto_pwhash/argon2/$(DEPDIR)/$(am__dirstamp) +crypto_pwhash/argon2/libsodium_la-argon2-fill-block-wasm32.lo: \ + crypto_pwhash/argon2/$(am__dirstamp) \ + crypto_pwhash/argon2/$(DEPDIR)/$(am__dirstamp) crypto_pwhash/argon2/libsodium_la-argon2.lo: \ crypto_pwhash/argon2/$(am__dirstamp) \ crypto_pwhash/argon2/$(DEPDIR)/$(am__dirstamp) @@ -2538,6 +2547,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-encoding.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-ref.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-wasm32.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-blake2b-long.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-pwhash_argon2i.Plo@am__quote@ # am--include-marker @@ -3104,6 +3114,13 @@ crypto_pwhash/argon2/libsodium_la-argon2-fill-block-ref.lo: crypto_pwhash/argon2 @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_pwhash/argon2/libsodium_la-argon2-fill-block-ref.lo `test -f 'crypto_pwhash/argon2/argon2-fill-block-ref.c' || echo '$(srcdir)/'`crypto_pwhash/argon2/argon2-fill-block-ref.c +crypto_pwhash/argon2/libsodium_la-argon2-fill-block-wasm32.lo: crypto_pwhash/argon2/argon2-fill-block-wasm32.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_pwhash/argon2/libsodium_la-argon2-fill-block-wasm32.lo -MD -MP -MF crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-wasm32.Tpo -c -o crypto_pwhash/argon2/libsodium_la-argon2-fill-block-wasm32.lo `test -f 'crypto_pwhash/argon2/argon2-fill-block-wasm32.c' || echo '$(srcdir)/'`crypto_pwhash/argon2/argon2-fill-block-wasm32.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-wasm32.Tpo crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-wasm32.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_pwhash/argon2/argon2-fill-block-wasm32.c' object='crypto_pwhash/argon2/libsodium_la-argon2-fill-block-wasm32.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_pwhash/argon2/libsodium_la-argon2-fill-block-wasm32.lo `test -f 'crypto_pwhash/argon2/argon2-fill-block-wasm32.c' || echo '$(srcdir)/'`crypto_pwhash/argon2/argon2-fill-block-wasm32.c + crypto_pwhash/argon2/libsodium_la-argon2.lo: crypto_pwhash/argon2/argon2.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_pwhash/argon2/libsodium_la-argon2.lo -MD -MP -MF crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2.Tpo -c -o crypto_pwhash/argon2/libsodium_la-argon2.lo `test -f 'crypto_pwhash/argon2/argon2.c' || echo '$(srcdir)/'`crypto_pwhash/argon2/argon2.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2.Tpo crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2.Plo @@ -4177,6 +4194,7 @@ distclean: distclean-recursive -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-encoding.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-ref.Plo + -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-wasm32.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-blake2b-long.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-pwhash_argon2i.Plo @@ -4358,6 +4376,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-encoding.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-ref.Plo + -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-fill-block-wasm32.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-blake2b-long.Plo -rm -f crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-pwhash_argon2i.Plo diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-core.c b/src/libsodium/crypto_pwhash/argon2/argon2-core.c index 2922942d..0017da52 100644 --- a/src/libsodium/crypto_pwhash/argon2/argon2-core.c +++ b/src/libsodium/crypto_pwhash/argon2/argon2-core.c @@ -522,6 +522,10 @@ static int argon2_pick_best_implementation(void) { /* LCOV_EXCL_START */ +#if defined(__wasm_simd128__) + fill_segment = argon2_fill_segment_wasm32; + return 0; +#endif #if defined(HAVE_AVX512FINTRIN_H) && defined(HAVE_AVX2INTRIN_H) && \ defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H) && \ !defined(__APPLE__) diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-core.h b/src/libsodium/crypto_pwhash/argon2/argon2-core.h index 2fd7f41c..b7e77630 100644 --- a/src/libsodium/crypto_pwhash/argon2/argon2-core.h +++ b/src/libsodium/crypto_pwhash/argon2/argon2-core.h @@ -257,6 +257,8 @@ void argon2_fill_segment_avx2(const argon2_instance_t *instance, argon2_position_t position); void argon2_fill_segment_ssse3(const argon2_instance_t *instance, argon2_position_t position); +void argon2_fill_segment_wasm32(const argon2_instance_t *instance, + argon2_position_t position); void argon2_fill_segment_ref(const argon2_instance_t *instance, argon2_position_t position); diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-wasm32.c b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-wasm32.c new file mode 100644 index 00000000..d8d65d8b --- /dev/null +++ b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-wasm32.c @@ -0,0 +1,214 @@ +/* + * Argon2 source code package + * + * Written by Daniel Dinu and Dmitry Khovratovich, 2015 + * + * This work is licensed under a Creative Commons CC0 1.0 License/Waiver. + * + * You should have received a copy of the CC0 Public Domain Dedication along + * with + * this software. If not, see + * . + * + * WebAssembly SIMD port of the SSSE3 implementation. + */ + +#include +#include +#include + +#include "argon2-core.h" +#include "argon2.h" +#include "private/common.h" + +#if defined(__wasm_simd128__) + +#include + +#include "blamka-round-wasm32.h" + +static void +fill_block(v128_t *state, const uint8_t *ref_block, uint8_t *next_block) +{ + v128_t block_XY[ARGON2_OWORDS_IN_BLOCK]; + uint32_t i; + + for (i = 0; i < ARGON2_OWORDS_IN_BLOCK; i++) { + block_XY[i] = state[i] = wasm_v128_xor( + state[i], wasm_v128_load((const v128_t *) (&ref_block[16 * i]))); + } + + for (i = 0; i < 8; ++i) { + BLAKE2_ROUND_WASM(state[8 * i + 0], state[8 * i + 1], state[8 * i + 2], + state[8 * i + 3], state[8 * i + 4], state[8 * i + 5], + state[8 * i + 6], state[8 * i + 7]); + } + + for (i = 0; i < 8; ++i) { + BLAKE2_ROUND_WASM(state[8 * 0 + i], state[8 * 1 + i], state[8 * 2 + i], + state[8 * 3 + i], state[8 * 4 + i], state[8 * 5 + i], + state[8 * 6 + i], state[8 * 7 + i]); + } + + for (i = 0; i < ARGON2_OWORDS_IN_BLOCK; i++) { + state[i] = wasm_v128_xor(state[i], block_XY[i]); + wasm_v128_store((v128_t *) (&next_block[16 * i]), state[i]); + } +} + +static void +fill_block_with_xor(v128_t *state, const uint8_t *ref_block, + uint8_t *next_block) +{ + v128_t block_XY[ARGON2_OWORDS_IN_BLOCK]; + uint32_t i; + + for (i = 0; i < ARGON2_OWORDS_IN_BLOCK; i++) { + state[i] = wasm_v128_xor( + state[i], wasm_v128_load((const v128_t *) (&ref_block[16 * i]))); + block_XY[i] = wasm_v128_xor( + state[i], wasm_v128_load((const v128_t *) (&next_block[16 * i]))); + } + + for (i = 0; i < 8; ++i) { + BLAKE2_ROUND_WASM(state[8 * i + 0], state[8 * i + 1], state[8 * i + 2], + state[8 * i + 3], state[8 * i + 4], state[8 * i + 5], + state[8 * i + 6], state[8 * i + 7]); + } + + for (i = 0; i < 8; ++i) { + BLAKE2_ROUND_WASM(state[8 * 0 + i], state[8 * 1 + i], state[8 * 2 + i], + state[8 * 3 + i], state[8 * 4 + i], state[8 * 5 + i], + state[8 * 6 + i], state[8 * 7 + i]); + } + + for (i = 0; i < ARGON2_OWORDS_IN_BLOCK; i++) { + state[i] = wasm_v128_xor(state[i], block_XY[i]); + wasm_v128_store((v128_t *) (&next_block[16 * i]), state[i]); + } +} + +static void +generate_addresses(const argon2_instance_t *instance, + const argon2_position_t *position, uint64_t *pseudo_rands) +{ + block address_block, input_block, tmp_block; + uint32_t i; + + init_block_value(&address_block, 0); + init_block_value(&input_block, 0); + + if (instance != NULL && position != NULL) { + input_block.v[0] = position->pass; + input_block.v[1] = position->lane; + input_block.v[2] = position->slice; + input_block.v[3] = instance->memory_blocks; + input_block.v[4] = instance->passes; + input_block.v[5] = instance->type; + + for (i = 0; i < instance->segment_length; ++i) { + if (i % ARGON2_ADDRESSES_IN_BLOCK == 0) { + v128_t zero_block[ARGON2_OWORDS_IN_BLOCK]; + v128_t zero2_block[ARGON2_OWORDS_IN_BLOCK]; + + memset(zero_block, 0, sizeof(zero_block)); + memset(zero2_block, 0, sizeof(zero2_block)); + init_block_value(&address_block, 0); + init_block_value(&tmp_block, 0); + input_block.v[6]++; + fill_block_with_xor(zero_block, (uint8_t *) &input_block.v, + (uint8_t *) &tmp_block.v); + fill_block_with_xor(zero2_block, (uint8_t *) &tmp_block.v, + (uint8_t *) &address_block.v); + } + + pseudo_rands[i] = address_block.v[i % ARGON2_ADDRESSES_IN_BLOCK]; + } + } +} + +void +argon2_fill_segment_wasm32(const argon2_instance_t *instance, + argon2_position_t position) +{ + block *ref_block = NULL, *curr_block = NULL; + uint64_t pseudo_rand, ref_index, ref_lane; + uint32_t prev_offset, curr_offset; + uint32_t starting_index, i; + v128_t state[ARGON2_OWORDS_IN_BLOCK]; + int data_independent_addressing = 1; + + uint64_t *pseudo_rands = NULL; + + if (instance == NULL) { + return; + } + + if (instance->type == Argon2_id && + (position.pass != 0 || position.slice >= ARGON2_SYNC_POINTS / 2)) { + data_independent_addressing = 0; + } + + pseudo_rands = instance->pseudo_rands; + + if (data_independent_addressing) { + generate_addresses(instance, &position, pseudo_rands); + } + + starting_index = 0; + + if ((0 == position.pass) && (0 == position.slice)) { + starting_index = 2; + } + + curr_offset = position.lane * instance->lane_length + + position.slice * instance->segment_length + starting_index; + + if (0 == curr_offset % instance->lane_length) { + prev_offset = curr_offset + instance->lane_length - 1; + } else { + prev_offset = curr_offset - 1; + } + + memcpy(state, ((instance->region->memory + prev_offset)->v), + ARGON2_BLOCK_SIZE); + + for (i = starting_index; i < instance->segment_length; + ++i, ++curr_offset, ++prev_offset) { + if (curr_offset % instance->lane_length == 1) { + prev_offset = curr_offset - 1; + } + + if (data_independent_addressing) { +#pragma warning(push) +#pragma warning(disable : 6385) + pseudo_rand = pseudo_rands[i]; +#pragma warning(pop) + } else { + pseudo_rand = instance->region->memory[prev_offset].v[0]; + } + + ref_lane = ((pseudo_rand >> 32)) % instance->lanes; + + if ((position.pass == 0) && (position.slice == 0)) { + ref_lane = position.lane; + } + + position.index = i; + ref_index = index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF, + ref_lane == position.lane); + + ref_block = instance->region->memory + + instance->lane_length * ref_lane + ref_index; + curr_block = instance->region->memory + curr_offset; + if (position.pass != 0) { + fill_block_with_xor(state, (uint8_t *) ref_block->v, + (uint8_t *) curr_block->v); + } else { + fill_block(state, (uint8_t *) ref_block->v, + (uint8_t *) curr_block->v); + } + } +} + +#endif diff --git a/src/libsodium/crypto_pwhash/argon2/blamka-round-wasm32.h b/src/libsodium/crypto_pwhash/argon2/blamka-round-wasm32.h new file mode 100644 index 00000000..ee334977 --- /dev/null +++ b/src/libsodium/crypto_pwhash/argon2/blamka-round-wasm32.h @@ -0,0 +1,134 @@ +#ifndef blamka_round_wasm32_H +#define blamka_round_wasm32_H + +#include +#include "private/common.h" + +static inline v128_t +fBlaMka_wasm(v128_t x, v128_t y) +{ + const v128_t z = wasm_u64x2_extmul_low_u32x4(x, y); + return wasm_i64x2_add(wasm_i64x2_add(x, y), wasm_i64x2_add(z, z)); +} + +static inline v128_t +rotr64_32_wasm(v128_t x) +{ + return wasm_i32x4_shuffle(x, x, 1, 0, 3, 2); +} + +static inline v128_t +rotr64_24_wasm(v128_t x) +{ + return wasm_v128_or(wasm_u64x2_shr(x, 24), wasm_i64x2_shl(x, 40)); +} + +static inline v128_t +rotr64_16_wasm(v128_t x) +{ + return wasm_v128_or(wasm_u64x2_shr(x, 16), wasm_i64x2_shl(x, 48)); +} + +static inline v128_t +rotr64_63_wasm(v128_t x) +{ + return wasm_v128_or(wasm_u64x2_shr(x, 63), wasm_i64x2_shl(x, 1)); +} + +#define G1_WASM(A0, B0, C0, D0, A1, B1, C1, D1) \ + do { \ + A0 = fBlaMka_wasm(A0, B0); \ + A1 = fBlaMka_wasm(A1, B1); \ + \ + D0 = wasm_v128_xor(D0, A0); \ + D1 = wasm_v128_xor(D1, A1); \ + \ + D0 = rotr64_32_wasm(D0); \ + D1 = rotr64_32_wasm(D1); \ + \ + C0 = fBlaMka_wasm(C0, D0); \ + C1 = fBlaMka_wasm(C1, D1); \ + \ + B0 = wasm_v128_xor(B0, C0); \ + B1 = wasm_v128_xor(B1, C1); \ + \ + B0 = rotr64_24_wasm(B0); \ + B1 = rotr64_24_wasm(B1); \ + } while ((void) 0, 0) + +#define G2_WASM(A0, B0, C0, D0, A1, B1, C1, D1) \ + do { \ + A0 = fBlaMka_wasm(A0, B0); \ + A1 = fBlaMka_wasm(A1, B1); \ + \ + D0 = wasm_v128_xor(D0, A0); \ + D1 = wasm_v128_xor(D1, A1); \ + \ + D0 = rotr64_16_wasm(D0); \ + D1 = rotr64_16_wasm(D1); \ + \ + C0 = fBlaMka_wasm(C0, D0); \ + C1 = fBlaMka_wasm(C1, D1); \ + \ + B0 = wasm_v128_xor(B0, C0); \ + B1 = wasm_v128_xor(B1, C1); \ + \ + B0 = rotr64_63_wasm(B0); \ + B1 = rotr64_63_wasm(B1); \ + } while ((void) 0, 0) + +static inline v128_t +wasm_alignr_8(v128_t a, v128_t b) +{ + return wasm_i8x16_shuffle(b, a, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23); +} + +#define DIAGONALIZE_WASM(A0, B0, C0, D0, A1, B1, C1, D1) \ + do { \ + v128_t t0 = wasm_alignr_8(B1, B0); \ + v128_t t1 = wasm_alignr_8(B0, B1); \ + B0 = t0; \ + B1 = t1; \ + \ + t0 = C0; \ + C0 = C1; \ + C1 = t0; \ + \ + t0 = wasm_alignr_8(D1, D0); \ + t1 = wasm_alignr_8(D0, D1); \ + D0 = t1; \ + D1 = t0; \ + } while ((void) 0, 0) + +#define UNDIAGONALIZE_WASM(A0, B0, C0, D0, A1, B1, C1, D1) \ + do { \ + v128_t t0 = wasm_alignr_8(B0, B1); \ + v128_t t1 = wasm_alignr_8(B1, B0); \ + B0 = t0; \ + B1 = t1; \ + \ + t0 = C0; \ + C0 = C1; \ + C1 = t0; \ + \ + t0 = wasm_alignr_8(D0, D1); \ + t1 = wasm_alignr_8(D1, D0); \ + D0 = t1; \ + D1 = t0; \ + } while ((void) 0, 0) + +#define BLAKE2_ROUND_WASM(A0, A1, B0, B1, C0, C1, D0, D1) \ + do { \ + G1_WASM(A0, B0, C0, D0, A1, B1, C1, D1); \ + G2_WASM(A0, B0, C0, D0, A1, B1, C1, D1); \ + \ + DIAGONALIZE_WASM(A0, B0, C0, D0, A1, B1, C1, D1); \ + \ + G1_WASM(A0, B0, C0, D0, A1, B1, C1, D1); \ + G2_WASM(A0, B0, C0, D0, A1, B1, C1, D1); \ + \ + UNDIAGONALIZE_WASM(A0, B0, C0, D0, A1, B1, C1, D1); \ + } while ((void) 0, 0) + +#endif