fix WASM compilation

Author: picnixz

Modules/blake2module.c

@@ -482,52 +482,53 @@ py_blake2_validate_params(Blake2Object *self,
         goto error;
     }
 
-#define CHECK_SIZE(NAME, VALUE, MAX, EXC_TYPE)                          \
+#define CHECK_LENGTH(NAME, VALUE, MAX)                                  \
     do {                                                                \
         if ((size_t)(VALUE) > (size_t)(MAX)) {                          \
-            PyErr_Format(EXC_TYPE,                                      \
-                         "maximum %s is %zu bytes, got %zd",            \
+            PyErr_Format(PyExc_ValueError,                              \
+                         "maximum %s length is %zu bytes, got %zd",     \
                          (NAME), (size_t)(MAX), (Py_ssize_t)(VALUE));   \
             goto error;                                                 \
         }                                                               \
     } while (0)
-#define CHECK_SIZE_VE(N, V, M) CHECK_SIZE(N, V, M, PyExc_ValueError)
-#define CHECK_SIZE_OE(N, V, M) CHECK_SIZE(N, V, M, PyExc_OverflowError)
-
-#define CHECK_TREE(NAME, VALUE, MIN, MAX)                           \
-    do {                                                            \
-        if ((VALUE) < (MIN) || (size_t)(VALUE) > (size_t)(MAX)) {   \
-            PyErr_Format(PyExc_ValueError,                          \
-                         "'%s' must be between %zu and %zu",        \
-                         (NAME), (size_t)(MIN), (size_t)(MAX));     \
-            goto error;                                             \
-        }                                                           \
-    } while (0)
-
     /* Validate key parameter. */
     if (key->obj && key->len) {
-        CHECK_SIZE_VE("key length", key->len, MAX_KEY_BYTES(self));
+        CHECK_LENGTH("key", key->len, MAX_KEY_BYTES(self));
     }
     /* Validate salt parameter. */
     if (salt->obj && salt->len) {
-        CHECK_SIZE_VE("salt length", salt->len, MAX_SALT_LENGTH(self));
+        CHECK_LENGTH("salt", salt->len, MAX_SALT_LENGTH(self));
     }
     /* Validate personalization parameter. */
     if (person->obj && person->len) {
-        CHECK_SIZE_VE("person length", person->len, MAX_PERSONAL_BYTES(self));
+        CHECK_LENGTH("person", person->len, MAX_PERSONAL_BYTES(self));
     }
+#undef CHECK_LENGTH
+#define CHECK_TREE(NAME, VALUE, MIN, MAX)                           \
+    do {                                                            \
+        if ((VALUE) < (MIN) || (size_t)(VALUE) > (size_t)(MAX)) {   \
+            PyErr_Format(PyExc_ValueError,                          \
+                         "'%s' must be between %zu and %zu",        \
+                         (NAME), (size_t)(MIN), (size_t)(MAX));     \
+            goto error;                                             \
+        }                                                           \
+    } while (0)
     /* Validate tree parameters. */
     CHECK_TREE("fanout", fanout, 0, 255);
     CHECK_TREE("depth", depth, 1, 255);
-    CHECK_SIZE_OE("leaf_size", leaf_size, 0xFFFFFFFFU);
-    if (is_blake2s(self->impl)) {
-        /* maximum: 2**48 - 1 */
-        CHECK_SIZE_OE("node_offset", node_offset, 0xFFFFFFFFFFFFULL);
-    }
     CHECK_TREE("node_depth", node_depth, 0, 255);
     CHECK_TREE("inner_size", inner_size, 0, MAX_OUT_BYTES(self));
 #undef CHECK_TREE
-#undef CHECK_SIZE
+    if (leaf_size > 0xFFFFFFFFU) {
+        /* maximum: 2**32 - 1 */
+        PyErr_SetString(PyExc_OverflowError, "'leaf_size' is too large");
+        goto error;
+    }
+    if (is_blake2s(self->impl) && node_offset > 0xFFFFFFFFFFFFULL) {
+        /* maximum: 2**48 - 1 */
+        PyErr_SetString(PyExc_OverflowError, "'node_offset' is too large");
+        goto error;
+    }
     return 0;
 error:
     return -1;