From 75bde190554b14d60439abfdd8df3d34b32e36eb Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 2 Apr 2022 09:32:22 +0200
Subject: [PATCH] Revert "Add the shifumi128 ZKP system"

This reverts commit 6efe9ee2b5588344c6ef6c85984f20efaf38e8f3.
---
 .gitignore                                    |  1 -
 .../msvc/vs2010/libsodium/libsodium.vcxproj   |  2 -
 .../libsodium/libsodium.vcxproj.filters       |  9 ----
 .../msvc/vs2012/libsodium/libsodium.vcxproj   |  2 -
 .../libsodium/libsodium.vcxproj.filters       |  9 ----
 .../msvc/vs2013/libsodium/libsodium.vcxproj   |  2 -
 .../libsodium/libsodium.vcxproj.filters       |  9 ----
 .../msvc/vs2015/libsodium/libsodium.vcxproj   |  2 -
 .../libsodium/libsodium.vcxproj.filters       |  9 ----
 .../msvc/vs2017/libsodium/libsodium.vcxproj   |  2 -
 .../libsodium/libsodium.vcxproj.filters       |  9 ----
 .../msvc/vs2019/libsodium/libsodium.vcxproj   |  2 -
 .../libsodium/libsodium.vcxproj.filters       |  9 ----
 .../msvc/vs2022/libsodium/libsodium.vcxproj   |  2 -
 .../libsodium/libsodium.vcxproj.filters       |  9 ----
 libsodium.vcxproj                             |  2 -
 libsodium.vcxproj.filters                     |  6 ---
 src/libsodium/Makefile.am                     |  1 -
 src/libsodium/crypto_zkp/shifumi128.c         | 51 -------------------
 src/libsodium/include/Makefile.am             |  1 -
 src/libsodium/include/sodium.h                |  1 -
 .../include/sodium/crypto_zkp_shifumi128.h    | 43 ----------------
 test/default/Makefile.am                      | 12 ++---
 test/default/shifumi128.c                     | 20 --------
 test/default/shifumi128.exp                   |  0
 25 files changed, 3 insertions(+), 212 deletions(-)
 delete mode 100644 src/libsodium/crypto_zkp/shifumi128.c
 delete mode 100644 src/libsodium/include/sodium/crypto_zkp_shifumi128.h
 delete mode 100644 test/default/shifumi128.c
 delete mode 100644 test/default/shifumi128.exp

diff --git a/.gitignore b/.gitignore
index fc4c16e3..44bef90f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,7 +166,6 @@ test/default/stream3
 test/default/stream4
 test/default/verify1
 test/default/xchacha20
-test/default/shifumi128
 test/js.done
 testing
 zig-cache
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index 864764b6..ab8bcb0a 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -182,7 +182,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\armcrypto\aead_aegis256_armcrypto.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
@@ -268,7 +267,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_ed25519.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\quirks.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h" />
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
index 1ef254cb..363a53bc 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
@@ -339,9 +339,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
       <Filter>crypto_aead\chacha20poly1305\sodium</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c">
-      <Filter>crypto_zkp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c">
       <Filter>crypto_secretstream\xchacha20poly1305</Filter>
     </ClCompile>
@@ -593,9 +590,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h">
-      <Filter>include\sodium</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h">
       <Filter>include\sodium\private</Filter>
     </ClInclude>
@@ -1039,9 +1033,6 @@
     <Filter Include="crypto_verify\sodium">
       <UniqueIdentifier>{80669cf5-3c9c-3c60-b409-9d8fb305bc77}</UniqueIdentifier>
     </Filter>
-    <Filter Include="crypto_zkp">
-      <UniqueIdentifier>{782f92dd-85aa-35fb-919d-aabbca1c59f1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{96da72eb-3aa0-3850-83eb-32788f91e5bd}</UniqueIdentifier>
     </Filter>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 89597d1e..f0210427 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -182,7 +182,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\armcrypto\aead_aegis256_armcrypto.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
@@ -268,7 +267,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_ed25519.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\quirks.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h" />
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
index 1ef254cb..363a53bc 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
@@ -339,9 +339,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
       <Filter>crypto_aead\chacha20poly1305\sodium</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c">
-      <Filter>crypto_zkp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c">
       <Filter>crypto_secretstream\xchacha20poly1305</Filter>
     </ClCompile>
@@ -593,9 +590,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h">
-      <Filter>include\sodium</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h">
       <Filter>include\sodium\private</Filter>
     </ClInclude>
@@ -1039,9 +1033,6 @@
     <Filter Include="crypto_verify\sodium">
       <UniqueIdentifier>{80669cf5-3c9c-3c60-b409-9d8fb305bc77}</UniqueIdentifier>
     </Filter>
-    <Filter Include="crypto_zkp">
-      <UniqueIdentifier>{782f92dd-85aa-35fb-919d-aabbca1c59f1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{96da72eb-3aa0-3850-83eb-32788f91e5bd}</UniqueIdentifier>
     </Filter>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index a7ace1e3..d4d521a7 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -182,7 +182,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\armcrypto\aead_aegis256_armcrypto.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
@@ -268,7 +267,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_ed25519.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\quirks.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h" />
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
index 1ef254cb..363a53bc 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
@@ -339,9 +339,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
       <Filter>crypto_aead\chacha20poly1305\sodium</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c">
-      <Filter>crypto_zkp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c">
       <Filter>crypto_secretstream\xchacha20poly1305</Filter>
     </ClCompile>
@@ -593,9 +590,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h">
-      <Filter>include\sodium</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h">
       <Filter>include\sodium\private</Filter>
     </ClInclude>
@@ -1039,9 +1033,6 @@
     <Filter Include="crypto_verify\sodium">
       <UniqueIdentifier>{80669cf5-3c9c-3c60-b409-9d8fb305bc77}</UniqueIdentifier>
     </Filter>
-    <Filter Include="crypto_zkp">
-      <UniqueIdentifier>{782f92dd-85aa-35fb-919d-aabbca1c59f1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{96da72eb-3aa0-3850-83eb-32788f91e5bd}</UniqueIdentifier>
     </Filter>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index 869c0471..ab07ff28 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -182,7 +182,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\armcrypto\aead_aegis256_armcrypto.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
@@ -268,7 +267,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_ed25519.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\quirks.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h" />
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
index 1ef254cb..363a53bc 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters
@@ -339,9 +339,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
       <Filter>crypto_aead\chacha20poly1305\sodium</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c">
-      <Filter>crypto_zkp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c">
       <Filter>crypto_secretstream\xchacha20poly1305</Filter>
     </ClCompile>
@@ -593,9 +590,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h">
-      <Filter>include\sodium</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h">
       <Filter>include\sodium\private</Filter>
     </ClInclude>
@@ -1039,9 +1033,6 @@
     <Filter Include="crypto_verify\sodium">
       <UniqueIdentifier>{80669cf5-3c9c-3c60-b409-9d8fb305bc77}</UniqueIdentifier>
     </Filter>
-    <Filter Include="crypto_zkp">
-      <UniqueIdentifier>{782f92dd-85aa-35fb-919d-aabbca1c59f1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{96da72eb-3aa0-3850-83eb-32788f91e5bd}</UniqueIdentifier>
     </Filter>
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
index a664f250..0de45ab3 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
@@ -182,7 +182,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\armcrypto\aead_aegis256_armcrypto.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
@@ -268,7 +267,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_ed25519.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\quirks.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h" />
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
index 1ef254cb..363a53bc 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters
@@ -339,9 +339,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
       <Filter>crypto_aead\chacha20poly1305\sodium</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c">
-      <Filter>crypto_zkp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c">
       <Filter>crypto_secretstream\xchacha20poly1305</Filter>
     </ClCompile>
@@ -593,9 +590,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h">
-      <Filter>include\sodium</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h">
       <Filter>include\sodium\private</Filter>
     </ClInclude>
@@ -1039,9 +1033,6 @@
     <Filter Include="crypto_verify\sodium">
       <UniqueIdentifier>{80669cf5-3c9c-3c60-b409-9d8fb305bc77}</UniqueIdentifier>
     </Filter>
-    <Filter Include="crypto_zkp">
-      <UniqueIdentifier>{782f92dd-85aa-35fb-919d-aabbca1c59f1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{96da72eb-3aa0-3850-83eb-32788f91e5bd}</UniqueIdentifier>
     </Filter>
diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj b/builds/msvc/vs2019/libsodium/libsodium.vcxproj
index ce7393a9..519d448e 100644
--- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj
@@ -206,7 +206,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\armcrypto\aead_aegis256_armcrypto.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
@@ -292,7 +291,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_ed25519.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\quirks.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h" />
diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters
index 1ef254cb..363a53bc 100644
--- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters
@@ -339,9 +339,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
       <Filter>crypto_aead\chacha20poly1305\sodium</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c">
-      <Filter>crypto_zkp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c">
       <Filter>crypto_secretstream\xchacha20poly1305</Filter>
     </ClCompile>
@@ -593,9 +590,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h">
-      <Filter>include\sodium</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h">
       <Filter>include\sodium\private</Filter>
     </ClInclude>
@@ -1039,9 +1033,6 @@
     <Filter Include="crypto_verify\sodium">
       <UniqueIdentifier>{80669cf5-3c9c-3c60-b409-9d8fb305bc77}</UniqueIdentifier>
     </Filter>
-    <Filter Include="crypto_zkp">
-      <UniqueIdentifier>{782f92dd-85aa-35fb-919d-aabbca1c59f1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{96da72eb-3aa0-3850-83eb-32788f91e5bd}</UniqueIdentifier>
     </Filter>
diff --git a/builds/msvc/vs2022/libsodium/libsodium.vcxproj b/builds/msvc/vs2022/libsodium/libsodium.vcxproj
index 68d121df..2aedf72c 100644
--- a/builds/msvc/vs2022/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2022/libsodium/libsodium.vcxproj
@@ -135,7 +135,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aegis256\armcrypto\aead_aegis256_armcrypto.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
@@ -221,7 +220,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_ed25519.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\quirks.h" />
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h" />
diff --git a/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters
index 1ef254cb..363a53bc 100644
--- a/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters
@@ -339,9 +339,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
       <Filter>crypto_aead\chacha20poly1305\sodium</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_zkp\shifumi128.c">
-      <Filter>crypto_zkp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c">
       <Filter>crypto_secretstream\xchacha20poly1305</Filter>
     </ClCompile>
@@ -593,9 +590,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h">
       <Filter>include\sodium</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_zkp_shifumi128.h">
-      <Filter>include\sodium</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\private\ed25519_ref10.h">
       <Filter>include\sodium\private</Filter>
     </ClInclude>
@@ -1039,9 +1033,6 @@
     <Filter Include="crypto_verify\sodium">
       <UniqueIdentifier>{80669cf5-3c9c-3c60-b409-9d8fb305bc77}</UniqueIdentifier>
     </Filter>
-    <Filter Include="crypto_zkp">
-      <UniqueIdentifier>{782f92dd-85aa-35fb-919d-aabbca1c59f1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include">
       <UniqueIdentifier>{96da72eb-3aa0-3850-83eb-32788f91e5bd}</UniqueIdentifier>
     </Filter>
diff --git a/libsodium.vcxproj b/libsodium.vcxproj
index a87a9c19..500f518a 100644
--- a/libsodium.vcxproj
+++ b/libsodium.vcxproj
@@ -420,7 +420,6 @@
     <ClCompile Include="src\libsodium\crypto_aead\aegis256\armcrypto\aead_aegis256_armcrypto.c" />
     <ClCompile Include="src\libsodium\crypto_aead\aes256gcm\aesni\aead_aes256gcm_aesni.c" />
     <ClCompile Include="src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c" />
-    <ClCompile Include="src\libsodium\crypto_zkp\shifumi128.c" />
     <ClCompile Include="src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c" />
     <ClCompile Include="src\libsodium\crypto_core\salsa\ref\core_salsa_ref.c" />
     <ClCompile Include="src\libsodium\crypto_core\hchacha20\core_hchacha20.c" />
@@ -506,7 +505,6 @@
     <ClInclude Include="src\libsodium\include\sodium\crypto_scalarmult_ed25519.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
-    <ClInclude Include="src\libsodium\include\sodium\crypto_zkp_shifumi128.h" />
     <ClInclude Include="src\libsodium\include\sodium\private\ed25519_ref10.h" />
     <ClInclude Include="src\libsodium\include\sodium\private\quirks.h" />
     <ClInclude Include="src\libsodium\include\sodium\private\ed25519_ref10_fe_25_5.h" />
diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters
index 5425d204..42bef65f 100644
--- a/libsodium.vcxproj.filters
+++ b/libsodium.vcxproj.filters
@@ -330,9 +330,6 @@
     <ClCompile Include="src\libsodium\crypto_aead\chacha20poly1305\sodium\aead_chacha20poly1305.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_zkp\shifumi128.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\libsodium\crypto_secretstream\xchacha20poly1305\secretstream_xchacha20poly1305.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -584,9 +581,6 @@
     <ClInclude Include="src\libsodium\include\sodium\crypto_generichash_blake2b.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\libsodium\include\sodium\crypto_zkp_shifumi128.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\libsodium\include\sodium\private\ed25519_ref10.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 57cd3aa1..f6e67f2d 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -86,7 +86,6 @@ libsodium_la_SOURCES = \
 	crypto_stream/salsa20/stream_salsa20.h \
 	crypto_stream/xsalsa20/stream_xsalsa20.c \
 	crypto_verify/sodium/verify.c \
-	crypto_zkp/shifumi128.c \
 	include/sodium/private/chacha20_ietf_ext.h \
 	include/sodium/private/common.h \
 	include/sodium/private/ed25519_ref10.h \
diff --git a/src/libsodium/crypto_zkp/shifumi128.c b/src/libsodium/crypto_zkp/shifumi128.c
deleted file mode 100644
index 9cf0044e..00000000
--- a/src/libsodium/crypto_zkp/shifumi128.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "crypto_shorthash_siphash24.h"
-#include "crypto_verify_16.h"
-#include "crypto_zkp_shifumi128.h"
-#include "randombytes.h"
-
-size_t
-crypto_zkp_shifumi128_secretbytes(void)
-{
-    return crypto_zkp_shifumi128_SECRETBYTES;
-}
-
-size_t
-crypto_zkp_shifumi128_bytes(void)
-{
-    return crypto_zkp_shifumi128_BYTES;
-}
-
-void
-crypto_zkp_shufumi128_pick(crypto_zkp_shifumi128_commitment *commitment)
-{
-    *commitment = (int) randombytes_uniform(3);
-}
-
-int
-crypto_zkp_shifumi128_commit(unsigned char secret[crypto_zkp_shifumi128_SECRETBYTES],
-                             unsigned char proof[crypto_zkp_shifumi128_BYTES],
-                             const crypto_zkp_shifumi128_commitment commitment)
-{
-    const unsigned char s[1] = { (const unsigned char) commitment };
-
-    if (commitment < 0 || commitment > 2) {
-        return -1;
-    }
-    randombytes_buf(secret, crypto_zkp_shifumi128_SECRETBYTES);
-    crypto_shorthash_siphashx24(proof, s, sizeof s, secret);
-
-    return 0;
-}
-
-int
-crypto_zkp_shifumi128_verify(const unsigned char secret[crypto_zkp_shifumi128_SECRETBYTES],
-                             const unsigned char proof[crypto_zkp_shifumi128_BYTES],
-                             const crypto_zkp_shifumi128_commitment commitment)
-{
-    const unsigned char s[1] = { (const unsigned char) commitment };
-    unsigned char       computed_proof[crypto_zkp_shifumi128_BYTES];
-
-    crypto_shorthash_siphashx24(computed_proof, s, sizeof s, secret);
-
-    return crypto_verify_16(computed_proof, proof);
-}
diff --git a/src/libsodium/include/Makefile.am b/src/libsodium/include/Makefile.am
index 000a2443..d639c634 100644
--- a/src/libsodium/include/Makefile.am
+++ b/src/libsodium/include/Makefile.am
@@ -59,7 +59,6 @@ SODIUM_EXPORT = \
 	sodium/crypto_verify_16.h \
 	sodium/crypto_verify_32.h \
 	sodium/crypto_verify_64.h \
-	sodium/crypto_zkp_shifumi128.h \
 	sodium/export.h \
 	sodium/randombytes.h \
 	sodium/randombytes_internal_random.h \
diff --git a/src/libsodium/include/sodium.h b/src/libsodium/include/sodium.h
index e2b1a1f6..610d6328 100644
--- a/src/libsodium/include/sodium.h
+++ b/src/libsodium/include/sodium.h
@@ -49,7 +49,6 @@
 #include "sodium/crypto_verify_16.h"
 #include "sodium/crypto_verify_32.h"
 #include "sodium/crypto_verify_64.h"
-#include "sodium/crypto_zkp_shifumi128.h"
 #include "sodium/randombytes.h"
 #include "sodium/randombytes_internal_random.h"
 #include "sodium/randombytes_sysrandom.h"
diff --git a/src/libsodium/include/sodium/crypto_zkp_shifumi128.h b/src/libsodium/include/sodium/crypto_zkp_shifumi128.h
deleted file mode 100644
index 85b0d0e7..00000000
--- a/src/libsodium/include/sodium/crypto_zkp_shifumi128.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef crypto_zkp_shifumi128_H
-#define crypto_zkp_shifumi128_H
-
-#include <stddef.h>
-#include "export.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum crypto_zkp_shifumi128_commitment {
-    crypto_zkp_shifumi128_ROCK,
-    crypto_zkp_shifumi128_PAPER,
-    crypto_zkp_shifumi128_SCISSORS
-} crypto_zkp_shifumi128_commitment;
-
-#define crypto_zkp_shifumi128_SECRETBYTES 16
-#define crypto_zkp_shifumi128_BYTES       16
-
-SODIUM_EXPORT
-size_t crypto_zkp_shifumi128_secretbytes(void);
-
-SODIUM_EXPORT
-size_t crypto_zkp_shifumi128_bytes(void);
-
-SODIUM_EXPORT
-void crypto_zkp_shufumi128_pick(crypto_zkp_shifumi128_commitment *commitment);
-
-SODIUM_EXPORT
-int crypto_zkp_shifumi128_commit(unsigned char secret[crypto_zkp_shifumi128_SECRETBYTES],
-                                 unsigned char proof[crypto_zkp_shifumi128_BYTES],
-                                 const crypto_zkp_shifumi128_commitment commitment);
-
-SODIUM_EXPORT
-int crypto_zkp_shifumi128_verify(const unsigned char secret[crypto_zkp_shifumi128_SECRETBYTES],
-                                 const unsigned char proof[crypto_zkp_shifumi128_BYTES],
-                                 const crypto_zkp_shifumi128_commitment commitment);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/test/default/Makefile.am b/test/default/Makefile.am
index c90d487c..a593c137 100644
--- a/test/default/Makefile.am
+++ b/test/default/Makefile.am
@@ -84,8 +84,7 @@ EXTRA_DIST = \
 	stream3.exp \
 	stream4.exp \
 	verify1.exp \
-	xchacha20.exp \
-	shifumi128.exp
+	xchacha20.exp
 
 DISTCLEANFILES = \
 	aead_aegis128l.res \
@@ -169,8 +168,7 @@ DISTCLEANFILES = \
 	stream3.res \
 	stream4.res \
 	verify1.res \
-	xchacha20.res \
-	shifumi128.res
+	xchacha20.res
 
 AM_CPPFLAGS = \
 	-DTEST_SRCDIR=\"@srcdir@\" \
@@ -251,8 +249,7 @@ TESTS_TARGETS = \
 	stream2 \
 	stream3 \
 	stream4 \
-	verify1 \
-	shifumi128
+	verify1
 
 if !EMSCRIPTEN
 TESTS_TARGETS += \
@@ -510,9 +507,6 @@ verify1_LDADD             = $(TESTS_LDADD)
 xchacha20_SOURCE          = cmptest.h xchacha20.c
 xchacha20_LDADD           = $(TESTS_LDADD)
 
-shifumi128_SOURC          = cmptest.h shifumi128.c
-shifumi128_LDADD          = $(TESTS_LDADD)
-
 if !MINIMAL
 TESTS_TARGETS += \
 	core_ed25519 \
diff --git a/test/default/shifumi128.c b/test/default/shifumi128.c
deleted file mode 100644
index 4da87989..00000000
--- a/test/default/shifumi128.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#define TEST_NAME "shifumi128"
-#include "cmptest.h"
-
-int
-main(void)
-{
-    unsigned char                    secret[crypto_zkp_shifumi128_SECRETBYTES];
-    unsigned char                    proof[crypto_zkp_shifumi128_BYTES];
-    crypto_zkp_shifumi128_commitment move;
-
-    crypto_zkp_shufumi128_pick(&move);
-    crypto_zkp_shifumi128_commit(secret, proof, move);
-
-    assert(crypto_zkp_shifumi128_verify(secret, proof, move) == 0);
-
-    crypto_zkp_shifumi128_commit(secret, proof, crypto_zkp_shifumi128_ROCK);
-
-    assert(crypto_zkp_shifumi128_verify(secret, proof,
-                                        crypto_zkp_shifumi128_PAPER) == -1);
-}
diff --git a/test/default/shifumi128.exp b/test/default/shifumi128.exp
deleted file mode 100644
index e69de29b..00000000