Use distinct types for sized and unsized strings

Fixes #322
jedisct1 · Dec 30, 2024 · dc7af52 · dc7af52
1 parent d127662
commit dc7af52
Show file tree

Hide file tree

Showing 94 changed files with 106 additions and 92 deletions.
diff --git a/browsers-test/aead_aegis128l.js b/browsers-test/aead_aegis128l.js
diff --git a/browsers-test/aead_aegis256.js b/browsers-test/aead_aegis256.js
diff --git a/browsers-test/aead_aes256gcm.js b/browsers-test/aead_aes256gcm.js
diff --git a/browsers-test/aead_aes256gcm2.js b/browsers-test/aead_aes256gcm2.js
diff --git a/browsers-test/aead_chacha20poly1305.js b/browsers-test/aead_chacha20poly1305.js
diff --git a/browsers-test/aead_chacha20poly13052.js b/browsers-test/aead_chacha20poly13052.js
diff --git a/browsers-test/aead_xchacha20poly1305.js b/browsers-test/aead_xchacha20poly1305.js
diff --git a/browsers-test/auth.js b/browsers-test/auth.js
diff --git a/browsers-test/auth2.js b/browsers-test/auth2.js
diff --git a/browsers-test/auth3.js b/browsers-test/auth3.js
diff --git a/browsers-test/auth5.js b/browsers-test/auth5.js
diff --git a/browsers-test/auth6.js b/browsers-test/auth6.js
diff --git a/browsers-test/auth7.js b/browsers-test/auth7.js
diff --git a/browsers-test/box.js b/browsers-test/box.js
diff --git a/browsers-test/box2.js b/browsers-test/box2.js
diff --git a/browsers-test/box7.js b/browsers-test/box7.js
diff --git a/browsers-test/box8.js b/browsers-test/box8.js
diff --git a/browsers-test/box_easy.js b/browsers-test/box_easy.js
diff --git a/browsers-test/box_easy2.js b/browsers-test/box_easy2.js
diff --git a/browsers-test/box_seal.js b/browsers-test/box_seal.js
diff --git a/browsers-test/box_seed.js b/browsers-test/box_seed.js
diff --git a/browsers-test/chacha20.js b/browsers-test/chacha20.js
diff --git a/browsers-test/codecs.js b/browsers-test/codecs.js
diff --git a/browsers-test/core1.js b/browsers-test/core1.js
diff --git a/browsers-test/core2.js b/browsers-test/core2.js
diff --git a/browsers-test/core3.js b/browsers-test/core3.js
diff --git a/browsers-test/core4.js b/browsers-test/core4.js
diff --git a/browsers-test/core5.js b/browsers-test/core5.js
diff --git a/browsers-test/core6.js b/browsers-test/core6.js
diff --git a/browsers-test/core_ed25519.js b/browsers-test/core_ed25519.js
diff --git a/browsers-test/core_ristretto255.js b/browsers-test/core_ristretto255.js
diff --git a/browsers-test/ed25519_convert.js b/browsers-test/ed25519_convert.js
diff --git a/browsers-test/generichash.js b/browsers-test/generichash.js
diff --git a/browsers-test/generichash2.js b/browsers-test/generichash2.js
diff --git a/browsers-test/generichash3.js b/browsers-test/generichash3.js
diff --git a/browsers-test/hash.js b/browsers-test/hash.js
diff --git a/browsers-test/hash3.js b/browsers-test/hash3.js
diff --git a/browsers-test/kdf.js b/browsers-test/kdf.js
diff --git a/browsers-test/kdf_hkdf.js b/browsers-test/kdf_hkdf.js
diff --git a/browsers-test/keygen.js b/browsers-test/keygen.js
diff --git a/browsers-test/kx.js b/browsers-test/kx.js
diff --git a/browsers-test/metamorphic.js b/browsers-test/metamorphic.js
diff --git a/browsers-test/misuse.js b/browsers-test/misuse.js
diff --git a/browsers-test/onetimeauth.js b/browsers-test/onetimeauth.js
diff --git a/browsers-test/onetimeauth2.js b/browsers-test/onetimeauth2.js
diff --git a/browsers-test/onetimeauth7.js b/browsers-test/onetimeauth7.js
diff --git a/browsers-test/pwhash_argon2i.js b/browsers-test/pwhash_argon2i.js
diff --git a/browsers-test/pwhash_argon2id.js b/browsers-test/pwhash_argon2id.js
diff --git a/browsers-test/pwhash_scrypt.js b/browsers-test/pwhash_scrypt.js
diff --git a/browsers-test/pwhash_scrypt_ll.js b/browsers-test/pwhash_scrypt_ll.js
diff --git a/browsers-test/randombytes.js b/browsers-test/randombytes.js
diff --git a/browsers-test/scalarmult.js b/browsers-test/scalarmult.js
diff --git a/browsers-test/scalarmult2.js b/browsers-test/scalarmult2.js
diff --git a/browsers-test/scalarmult5.js b/browsers-test/scalarmult5.js
diff --git a/browsers-test/scalarmult6.js b/browsers-test/scalarmult6.js
diff --git a/browsers-test/scalarmult7.js b/browsers-test/scalarmult7.js
diff --git a/browsers-test/scalarmult8.js b/browsers-test/scalarmult8.js
diff --git a/browsers-test/scalarmult_ed25519.js b/browsers-test/scalarmult_ed25519.js
diff --git a/browsers-test/scalarmult_ristretto255.js b/browsers-test/scalarmult_ristretto255.js
diff --git a/browsers-test/secretbox.js b/browsers-test/secretbox.js
diff --git a/browsers-test/secretbox2.js b/browsers-test/secretbox2.js
diff --git a/browsers-test/secretbox7.js b/browsers-test/secretbox7.js
diff --git a/browsers-test/secretbox8.js b/browsers-test/secretbox8.js
diff --git a/browsers-test/secretbox_easy.js b/browsers-test/secretbox_easy.js
diff --git a/browsers-test/secretbox_easy2.js b/browsers-test/secretbox_easy2.js
diff --git a/browsers-test/secretstream_xchacha20poly1305.js b/browsers-test/secretstream_xchacha20poly1305.js
diff --git a/browsers-test/shorthash.js b/browsers-test/shorthash.js
diff --git a/browsers-test/sign.js b/browsers-test/sign.js
diff --git a/browsers-test/siphashx24.js b/browsers-test/siphashx24.js
diff --git a/browsers-test/sodium_core.js b/browsers-test/sodium_core.js
diff --git a/browsers-test/sodium_utils.js b/browsers-test/sodium_utils.js
diff --git a/browsers-test/sodium_version.js b/browsers-test/sodium_version.js
diff --git a/browsers-test/stream.js b/browsers-test/stream.js
diff --git a/browsers-test/stream2.js b/browsers-test/stream2.js
diff --git a/browsers-test/stream3.js b/browsers-test/stream3.js
diff --git a/browsers-test/stream4.js b/browsers-test/stream4.js
diff --git a/browsers-test/verify1.js b/browsers-test/verify1.js
diff --git a/browsers-test/xchacha20.js b/browsers-test/xchacha20.js
diff --git a/dist/browsers-sumo/sodium.js b/dist/browsers-sumo/sodium.js
diff --git a/dist/browsers/sodium.js b/dist/browsers/sodium.js
diff --git a/dist/modules-sumo/libsodium-sumo.js b/dist/modules-sumo/libsodium-sumo.js
diff --git a/dist/modules-sumo/libsodium-wrappers.js b/dist/modules-sumo/libsodium-wrappers.js
diff --git a/dist/modules/libsodium-wrappers.js b/dist/modules/libsodium-wrappers.js
diff --git a/dist/modules/libsodium.js b/dist/modules/libsodium.js
diff --git a/libsodium b/libsodium
diff --git a/package-libsodium-wrappers-sumo.json b/package-libsodium-wrappers-sumo.json
@@ -15,7 +15,7 @@
     "libsodium-sumo": "^0.7.15"
   },
   "devDependencies": {
-    "terser": "^5.31.2"
+    "terser": "^5.37.0"
   },
   "keywords": [
     "crypto",

diff --git a/package-libsodium-wrappers.json b/package-libsodium-wrappers.json
@@ -15,7 +15,7 @@
     "libsodium": "^0.7.15"
   },
   "devDependencies": {
-    "terser": "^5.31.2"
+    "terser": "^5.37.0"
   },
   "keywords": [
     "crypto",

diff --git a/package.json b/package.json
@@ -39,5 +39,8 @@
     "fs": false,
     "path": false,
     "stream": false
+  },
+  "dependencies": {
+    "terser": "^5.37.0"
   }
 }
diff --git a/wrapper/build-doc.js b/wrapper/build-doc.js
@@ -109,8 +109,10 @@ exports.buildDocForSymbol = function (s) {
         sDoc += "Secretstream XChaCha20Poly1305 state address";
       } else if (paramType == "randombytes_implementation") {
         sDoc += "Randombytes implementation";
-      } else if (paramType == "string") {
+      } else if (paramType == "unsized_string") {
         sDoc += "A string";
+      } else if (paramType == "string") {
+        sDoc += "A string with a fixed length";
       } else if (paramType == "u64") {
         sDoc += "An unsigned int or 64-bit BigInt";
       } else throw new Error("Unknown parameter type: " + paramType);

diff --git a/wrapper/macros/input_string.js b/wrapper/macros/input_string.js
@@ -4,7 +4,7 @@ if (typeof {var_name} !== "string") {
     _free_and_throw_type_error(address_pool, "{var_name} must be a string");
 }
 {var_name} = from_string({var_name} + "\0");
-if ({var_name}_length != undefined && {var_name}.length - 1 !== {var_name}_length) {
+if ({var_name}.length - 1 !== {var_length}) {
     _free_and_throw_type_error(address_pool, "invalid {var_name} length");
 }
 var {var_name}_address = _to_allocated_buf_address({var_name}),

diff --git a/wrapper/macros/input_unsized_string.js b/wrapper/macros/input_unsized_string.js
@@ -0,0 +1,9 @@
+// ---------- input: {var_name} (string)
+
+if (typeof {var_name} !== "string") {
+    _free_and_throw_type_error(address_pool, "{var_name} must be a string");
+}
+{var_name} = from_string({var_name} + "\0");
+var {var_name}_address = _to_allocated_buf_address({var_name}),
+    {var_name}_length = {var_name}.length - 1;
+address_pool.push({var_name}_address);
diff --git a/wrapper/symbols/crypto_pwhash_scryptsalsa208sha256_str_verify.json b/wrapper/symbols/crypto_pwhash_scryptsalsa208sha256_str_verify.json
@@ -4,7 +4,7 @@
   "inputs": [
     {
       "name": "hashed_password",
-      "type": "string"
+      "type": "unsized_string"
     },
     {
       "name": "password",

diff --git a/wrapper/symbols/crypto_pwhash_str_needs_rehash.json b/wrapper/symbols/crypto_pwhash_str_needs_rehash.json
@@ -4,7 +4,7 @@
   "inputs": [
     {
       "name": "hashed_password",
-      "type": "string"
+      "type": "unsized_string"
     },
     {
       "name": "opsLimit",

diff --git a/wrapper/symbols/crypto_pwhash_str_verify.json b/wrapper/symbols/crypto_pwhash_str_verify.json
@@ -4,7 +4,7 @@
   "inputs": [
     {
       "name": "hashed_password",
-      "type": "string"
+      "type": "unsized_string"
     },
     {
       "name": "password",
+3 −2		.github/workflows/ci.yml
+32 −0		.github/workflows/cifuzz.yml
+35 −17		.github/workflows/codeql-analysis.yml
+46 −49		.github/workflows/dotnet-core.yml
+2 −2		azure-pipelines.yml
+412 −324		build-aux/ltmain.sh
+88 −88		build.zig
+25 −0		builds/msvc/build/buildbase.bat
+942 −317		configure
+1 −0		dist-build/android-armv7-a.sh
+1 −0		dist-build/android-armv8-a.sh
+0 −1		dist-build/android-build.sh
+1 −0		dist-build/android-x86.sh
+1 −0		dist-build/android-x86_64.sh
+111 −3		dist-build/apple-xcframework.sh
+275 −187		m4/libtool.m4
+69 −39		m4/ltoptions.m4
+6 −6		m4/ltversion.m4
+1 −1		packaging/dotnet-core/libsodium.pkgproj
+1 −1		packaging/nuget/package.config
+2 −2		src/libsodium/crypto_aead/aegis128l/aegis128l_common.h
+2 −2		src/libsodium/crypto_aead/aegis256/aegis256_common.h
+26 −13		src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
+207 −10		src/libsodium/crypto_core/softaes/softaes.c
+11 −3		src/libsodium/crypto_verify/verify.c
+9 −8		src/libsodium/randombytes/internal/randombytes_internal_random.c
+0 −1		test/default/scalarmult2.c
+0 −1		test/default/scalarmult5.c