From a35e13c301db1fd33ef223536d9871907db125e1 Mon Sep 17 00:00:00 2001
From: rtjk <47841774+rtjk@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:32:30 +0200
Subject: [PATCH] int defines in api.h don't need to be "L"

Signed-off-by: rtjk <47841774+rtjk@users.noreply.github.com>
---
 docs/algorithms/sig/cross.md                               | 2 +-
 docs/algorithms/sig/cross.yml                              | 2 +-
 scripts/copy_from_upstream/copy_from_upstream.yml          | 2 +-
 src/sig/cross/upcross_cross-rsdp-128-balanced_avx2/api.h   | 6 +++---
 src/sig/cross/upcross_cross-rsdp-128-balanced_clean/api.h  | 6 +++---
 src/sig/cross/upcross_cross-rsdp-128-fast_avx2/api.h       | 6 +++---
 src/sig/cross/upcross_cross-rsdp-128-fast_clean/api.h      | 6 +++---
 src/sig/cross/upcross_cross-rsdp-128-small_avx2/api.h      | 6 +++---
 src/sig/cross/upcross_cross-rsdp-128-small_clean/api.h     | 6 +++---
 src/sig/cross/upcross_cross-rsdp-192-balanced_avx2/api.h   | 6 +++---
 src/sig/cross/upcross_cross-rsdp-192-balanced_clean/api.h  | 6 +++---
 src/sig/cross/upcross_cross-rsdp-192-fast_avx2/api.h       | 6 +++---
 src/sig/cross/upcross_cross-rsdp-192-fast_clean/api.h      | 6 +++---
 src/sig/cross/upcross_cross-rsdp-192-small_avx2/api.h      | 6 +++---
 src/sig/cross/upcross_cross-rsdp-192-small_clean/api.h     | 6 +++---
 src/sig/cross/upcross_cross-rsdp-256-balanced_avx2/api.h   | 6 +++---
 src/sig/cross/upcross_cross-rsdp-256-balanced_clean/api.h  | 6 +++---
 src/sig/cross/upcross_cross-rsdp-256-fast_avx2/api.h       | 6 +++---
 src/sig/cross/upcross_cross-rsdp-256-fast_clean/api.h      | 6 +++---
 src/sig/cross/upcross_cross-rsdp-256-small_avx2/api.h      | 6 +++---
 src/sig/cross/upcross_cross-rsdp-256-small_clean/api.h     | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-128-balanced_avx2/api.h  | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-128-balanced_clean/api.h | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-128-fast_avx2/api.h      | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-128-fast_clean/api.h     | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-128-small_avx2/api.h     | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-128-small_clean/api.h    | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-192-balanced_avx2/api.h  | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-192-balanced_clean/api.h | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-192-fast_avx2/api.h      | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-192-fast_clean/api.h     | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-192-small_avx2/api.h     | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-192-small_clean/api.h    | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-256-balanced_avx2/api.h  | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-256-balanced_clean/api.h | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-256-fast_avx2/api.h      | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-256-fast_clean/api.h     | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-256-small_avx2/api.h     | 6 +++---
 src/sig/cross/upcross_cross-rsdpg-256-small_clean/api.h    | 6 +++---
 39 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/docs/algorithms/sig/cross.md b/docs/algorithms/sig/cross.md
index 0bbcb6fc0..90c2019a4 100644
--- a/docs/algorithms/sig/cross.md
+++ b/docs/algorithms/sig/cross.md
@@ -7,7 +7,7 @@
 - **Authors' website**: https://www.cross-crypto.com/
 - **Specification version**: 1.2 + Keccak_x4 + PQClean fixes.
 - **Primary Source**<a name="primary-source"></a>:
-  - **Source**: https://github.com/rtjk/CROSS-PQClean/commit/bd89242834d7eecb00c1064be421b76dc2d90b41
+  - **Source**: https://github.com/rtjk/CROSS-PQClean/commit/64529ee21c8cf791774d5ce63a68053634d1d94f
   - **Implementation license (SPDX-Identifier)**: CC0-1.0
 
 
diff --git a/docs/algorithms/sig/cross.yml b/docs/algorithms/sig/cross.yml
index d155cec01..377f41503 100644
--- a/docs/algorithms/sig/cross.yml
+++ b/docs/algorithms/sig/cross.yml
@@ -21,7 +21,7 @@ website: https://www.cross-crypto.com/
 nist-round: 1
 spec-version: 1.2 + Keccak_x4 + PQClean fixes
 primary-upstream:
-  source: https://github.com/rtjk/CROSS-PQClean/commit/bd89242834d7eecb00c1064be421b76dc2d90b41
+  source: https://github.com/rtjk/CROSS-PQClean/commit/64529ee21c8cf791774d5ce63a68053634d1d94f
   spdx-license-identifier: CC0-1.0
 parameter-sets:
 - name: cross-rsdp-128-balanced
diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml
index 230d60960..17e598d53 100644
--- a/scripts/copy_from_upstream/copy_from_upstream.yml
+++ b/scripts/copy_from_upstream/copy_from_upstream.yml
@@ -65,7 +65,7 @@ upstreams:
     name: upcross
     git_url: https://github.com/rtjk/CROSS-PQClean.git
     git_branch: master
-    git_commit: bd89242834d7eecb00c1064be421b76dc2d90b41
+    git_commit: 64529ee21c8cf791774d5ce63a68053634d1d94f
     sig_meta_path: 'generate/crypto_sign/{pqclean_scheme}/META.yml'
     sig_scheme_path: 'generate/crypto_sign/{pqclean_scheme}'
 kems:
diff --git a/src/sig/cross/upcross_cross-rsdp-128-balanced_avx2/api.h b/src/sig/cross/upcross_cross-rsdp-128-balanced_avx2/api.h
index 976381c55..e93861eb6 100644
--- a/src/sig/cross/upcross_cross-rsdp-128-balanced_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-128-balanced_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP128BALANCED_AVX2_CRYPTO_ALGNAME "cross-rsdp-128-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP128BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDP128BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP128BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 77L
+#define PQCLEAN_CROSSRSDP128BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 77
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP128BALANCED_AVX2_CRYPTO_BYTES 12912L
+#define PQCLEAN_CROSSRSDP128BALANCED_AVX2_CRYPTO_BYTES 12912
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP128BALANCED_AVX2_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdp-128-balanced_clean/api.h b/src/sig/cross/upcross_cross-rsdp-128-balanced_clean/api.h
index ced630631..80f77b6fe 100644
--- a/src/sig/cross/upcross_cross-rsdp-128-balanced_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-128-balanced_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP128BALANCED_CLEAN_CRYPTO_ALGNAME "cross-rsdp-128-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP128BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDP128BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP128BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 77L
+#define PQCLEAN_CROSSRSDP128BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 77
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP128BALANCED_CLEAN_CRYPTO_BYTES 12912L
+#define PQCLEAN_CROSSRSDP128BALANCED_CLEAN_CRYPTO_BYTES 12912
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP128BALANCED_CLEAN_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdp-128-fast_avx2/api.h b/src/sig/cross/upcross_cross-rsdp-128-fast_avx2/api.h
index 59167e328..3e0e807a7 100644
--- a/src/sig/cross/upcross_cross-rsdp-128-fast_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-128-fast_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP128FAST_AVX2_CRYPTO_ALGNAME "cross-rsdp-128-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP128FAST_AVX2_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDP128FAST_AVX2_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP128FAST_AVX2_CRYPTO_PUBLICKEYBYTES 77L
+#define PQCLEAN_CROSSRSDP128FAST_AVX2_CRYPTO_PUBLICKEYBYTES 77
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP128FAST_AVX2_CRYPTO_BYTES 19152L
+#define PQCLEAN_CROSSRSDP128FAST_AVX2_CRYPTO_BYTES 19152
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP128FAST_AVX2_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdp-128-fast_clean/api.h b/src/sig/cross/upcross_cross-rsdp-128-fast_clean/api.h
index 812026618..40252ff01 100644
--- a/src/sig/cross/upcross_cross-rsdp-128-fast_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-128-fast_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP128FAST_CLEAN_CRYPTO_ALGNAME "cross-rsdp-128-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP128FAST_CLEAN_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDP128FAST_CLEAN_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP128FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 77L
+#define PQCLEAN_CROSSRSDP128FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 77
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP128FAST_CLEAN_CRYPTO_BYTES 19152L
+#define PQCLEAN_CROSSRSDP128FAST_CLEAN_CRYPTO_BYTES 19152
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP128FAST_CLEAN_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdp-128-small_avx2/api.h b/src/sig/cross/upcross_cross-rsdp-128-small_avx2/api.h
index fedbea0f5..c9a1cee1f 100644
--- a/src/sig/cross/upcross_cross-rsdp-128-small_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-128-small_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP128SMALL_AVX2_CRYPTO_ALGNAME "cross-rsdp-128-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP128SMALL_AVX2_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDP128SMALL_AVX2_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP128SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 77L
+#define PQCLEAN_CROSSRSDP128SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 77
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP128SMALL_AVX2_CRYPTO_BYTES 10080L
+#define PQCLEAN_CROSSRSDP128SMALL_AVX2_CRYPTO_BYTES 10080
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP128SMALL_AVX2_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdp-128-small_clean/api.h b/src/sig/cross/upcross_cross-rsdp-128-small_clean/api.h
index dafd93bcc..58a21b3f8 100644
--- a/src/sig/cross/upcross_cross-rsdp-128-small_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-128-small_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP128SMALL_CLEAN_CRYPTO_ALGNAME "cross-rsdp-128-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP128SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDP128SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP128SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 77L
+#define PQCLEAN_CROSSRSDP128SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 77
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP128SMALL_CLEAN_CRYPTO_BYTES 10080L
+#define PQCLEAN_CROSSRSDP128SMALL_CLEAN_CRYPTO_BYTES 10080
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP128SMALL_CLEAN_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdp-192-balanced_avx2/api.h b/src/sig/cross/upcross_cross-rsdp-192-balanced_avx2/api.h
index d6e62a593..3d24f11b5 100644
--- a/src/sig/cross/upcross_cross-rsdp-192-balanced_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-192-balanced_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP192BALANCED_AVX2_CRYPTO_ALGNAME "cross-rsdp-192-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP192BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDP192BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP192BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 115L
+#define PQCLEAN_CROSSRSDP192BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 115
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP192BALANCED_AVX2_CRYPTO_BYTES 28222L
+#define PQCLEAN_CROSSRSDP192BALANCED_AVX2_CRYPTO_BYTES 28222
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP192BALANCED_AVX2_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdp-192-balanced_clean/api.h b/src/sig/cross/upcross_cross-rsdp-192-balanced_clean/api.h
index b405b14c1..8772b35d8 100644
--- a/src/sig/cross/upcross_cross-rsdp-192-balanced_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-192-balanced_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP192BALANCED_CLEAN_CRYPTO_ALGNAME "cross-rsdp-192-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP192BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDP192BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP192BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 115L
+#define PQCLEAN_CROSSRSDP192BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 115
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP192BALANCED_CLEAN_CRYPTO_BYTES 28222L
+#define PQCLEAN_CROSSRSDP192BALANCED_CLEAN_CRYPTO_BYTES 28222
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP192BALANCED_CLEAN_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdp-192-fast_avx2/api.h b/src/sig/cross/upcross_cross-rsdp-192-fast_avx2/api.h
index c6d18939c..61d14364f 100644
--- a/src/sig/cross/upcross_cross-rsdp-192-fast_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-192-fast_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP192FAST_AVX2_CRYPTO_ALGNAME "cross-rsdp-192-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP192FAST_AVX2_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDP192FAST_AVX2_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP192FAST_AVX2_CRYPTO_PUBLICKEYBYTES 115L
+#define PQCLEAN_CROSSRSDP192FAST_AVX2_CRYPTO_PUBLICKEYBYTES 115
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP192FAST_AVX2_CRYPTO_BYTES 42682L
+#define PQCLEAN_CROSSRSDP192FAST_AVX2_CRYPTO_BYTES 42682
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP192FAST_AVX2_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdp-192-fast_clean/api.h b/src/sig/cross/upcross_cross-rsdp-192-fast_clean/api.h
index ab4f5db66..6be7d2810 100644
--- a/src/sig/cross/upcross_cross-rsdp-192-fast_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-192-fast_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP192FAST_CLEAN_CRYPTO_ALGNAME "cross-rsdp-192-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP192FAST_CLEAN_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDP192FAST_CLEAN_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP192FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 115L
+#define PQCLEAN_CROSSRSDP192FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 115
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP192FAST_CLEAN_CRYPTO_BYTES 42682L
+#define PQCLEAN_CROSSRSDP192FAST_CLEAN_CRYPTO_BYTES 42682
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP192FAST_CLEAN_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdp-192-small_avx2/api.h b/src/sig/cross/upcross_cross-rsdp-192-small_avx2/api.h
index 581620569..a9d72da46 100644
--- a/src/sig/cross/upcross_cross-rsdp-192-small_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-192-small_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP192SMALL_AVX2_CRYPTO_ALGNAME "cross-rsdp-192-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP192SMALL_AVX2_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDP192SMALL_AVX2_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP192SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 115L
+#define PQCLEAN_CROSSRSDP192SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 115
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP192SMALL_AVX2_CRYPTO_BYTES 23642L
+#define PQCLEAN_CROSSRSDP192SMALL_AVX2_CRYPTO_BYTES 23642
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP192SMALL_AVX2_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdp-192-small_clean/api.h b/src/sig/cross/upcross_cross-rsdp-192-small_clean/api.h
index 61ba054da..e1ae23246 100644
--- a/src/sig/cross/upcross_cross-rsdp-192-small_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-192-small_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP192SMALL_CLEAN_CRYPTO_ALGNAME "cross-rsdp-192-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP192SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDP192SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP192SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 115L
+#define PQCLEAN_CROSSRSDP192SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 115
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP192SMALL_CLEAN_CRYPTO_BYTES 23642L
+#define PQCLEAN_CROSSRSDP192SMALL_CLEAN_CRYPTO_BYTES 23642
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP192SMALL_CLEAN_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdp-256-balanced_avx2/api.h b/src/sig/cross/upcross_cross-rsdp-256-balanced_avx2/api.h
index 7235a25e5..e492205ed 100644
--- a/src/sig/cross/upcross_cross-rsdp-256-balanced_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-256-balanced_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP256BALANCED_AVX2_CRYPTO_ALGNAME "cross-rsdp-256-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP256BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDP256BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP256BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 153L
+#define PQCLEAN_CROSSRSDP256BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 153
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP256BALANCED_AVX2_CRYPTO_BYTES 51056L
+#define PQCLEAN_CROSSRSDP256BALANCED_AVX2_CRYPTO_BYTES 51056
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP256BALANCED_AVX2_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdp-256-balanced_clean/api.h b/src/sig/cross/upcross_cross-rsdp-256-balanced_clean/api.h
index d6bce70fe..e82e471f8 100644
--- a/src/sig/cross/upcross_cross-rsdp-256-balanced_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-256-balanced_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP256BALANCED_CLEAN_CRYPTO_ALGNAME "cross-rsdp-256-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP256BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDP256BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP256BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 153L
+#define PQCLEAN_CROSSRSDP256BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 153
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP256BALANCED_CLEAN_CRYPTO_BYTES 51056L
+#define PQCLEAN_CROSSRSDP256BALANCED_CLEAN_CRYPTO_BYTES 51056
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP256BALANCED_CLEAN_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdp-256-fast_avx2/api.h b/src/sig/cross/upcross_cross-rsdp-256-fast_avx2/api.h
index 0b567a79b..a82c414d1 100644
--- a/src/sig/cross/upcross_cross-rsdp-256-fast_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-256-fast_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP256FAST_AVX2_CRYPTO_ALGNAME "cross-rsdp-256-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP256FAST_AVX2_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDP256FAST_AVX2_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP256FAST_AVX2_CRYPTO_PUBLICKEYBYTES 153L
+#define PQCLEAN_CROSSRSDP256FAST_AVX2_CRYPTO_PUBLICKEYBYTES 153
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP256FAST_AVX2_CRYPTO_BYTES 76298L
+#define PQCLEAN_CROSSRSDP256FAST_AVX2_CRYPTO_BYTES 76298
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP256FAST_AVX2_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdp-256-fast_clean/api.h b/src/sig/cross/upcross_cross-rsdp-256-fast_clean/api.h
index d54077624..3fc8e33e6 100644
--- a/src/sig/cross/upcross_cross-rsdp-256-fast_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-256-fast_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP256FAST_CLEAN_CRYPTO_ALGNAME "cross-rsdp-256-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP256FAST_CLEAN_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDP256FAST_CLEAN_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP256FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 153L
+#define PQCLEAN_CROSSRSDP256FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 153
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP256FAST_CLEAN_CRYPTO_BYTES 76298L
+#define PQCLEAN_CROSSRSDP256FAST_CLEAN_CRYPTO_BYTES 76298
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP256FAST_CLEAN_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdp-256-small_avx2/api.h b/src/sig/cross/upcross_cross-rsdp-256-small_avx2/api.h
index c6ffc0daf..10112be21 100644
--- a/src/sig/cross/upcross_cross-rsdp-256-small_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-256-small_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP256SMALL_AVX2_CRYPTO_ALGNAME "cross-rsdp-256-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP256SMALL_AVX2_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDP256SMALL_AVX2_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP256SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 153L
+#define PQCLEAN_CROSSRSDP256SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 153
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP256SMALL_AVX2_CRYPTO_BYTES 43592L
+#define PQCLEAN_CROSSRSDP256SMALL_AVX2_CRYPTO_BYTES 43592
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP256SMALL_AVX2_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdp-256-small_clean/api.h b/src/sig/cross/upcross_cross-rsdp-256-small_clean/api.h
index efb31c797..3e2aebfe3 100644
--- a/src/sig/cross/upcross_cross-rsdp-256-small_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdp-256-small_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDP256SMALL_CLEAN_CRYPTO_ALGNAME "cross-rsdp-256-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDP256SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDP256SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDP256SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 153L
+#define PQCLEAN_CROSSRSDP256SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 153
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDP256SMALL_CLEAN_CRYPTO_BYTES 43592L
+#define PQCLEAN_CROSSRSDP256SMALL_CLEAN_CRYPTO_BYTES 43592
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDP256SMALL_CLEAN_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdpg-128-balanced_avx2/api.h b/src/sig/cross/upcross_cross-rsdpg-128-balanced_avx2/api.h
index 68b919c6f..d21da450c 100644
--- a/src/sig/cross/upcross_cross-rsdpg-128-balanced_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-128-balanced_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG128BALANCED_AVX2_CRYPTO_ALGNAME "cross-rsdpg-128-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG128BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDPG128BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG128BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 54L
+#define PQCLEAN_CROSSRSDPG128BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 54
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG128BALANCED_AVX2_CRYPTO_BYTES 9236L
+#define PQCLEAN_CROSSRSDPG128BALANCED_AVX2_CRYPTO_BYTES 9236
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG128BALANCED_AVX2_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdpg-128-balanced_clean/api.h b/src/sig/cross/upcross_cross-rsdpg-128-balanced_clean/api.h
index 5496fd21d..fd4512711 100644
--- a/src/sig/cross/upcross_cross-rsdpg-128-balanced_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-128-balanced_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG128BALANCED_CLEAN_CRYPTO_ALGNAME "cross-rsdpg-128-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG128BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDPG128BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG128BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 54L
+#define PQCLEAN_CROSSRSDPG128BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 54
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG128BALANCED_CLEAN_CRYPTO_BYTES 9236L
+#define PQCLEAN_CROSSRSDPG128BALANCED_CLEAN_CRYPTO_BYTES 9236
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG128BALANCED_CLEAN_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdpg-128-fast_avx2/api.h b/src/sig/cross/upcross_cross-rsdpg-128-fast_avx2/api.h
index ab19472c0..42bd5996b 100644
--- a/src/sig/cross/upcross_cross-rsdpg-128-fast_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-128-fast_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG128FAST_AVX2_CRYPTO_ALGNAME "cross-rsdpg-128-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG128FAST_AVX2_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDPG128FAST_AVX2_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG128FAST_AVX2_CRYPTO_PUBLICKEYBYTES 54L
+#define PQCLEAN_CROSSRSDPG128FAST_AVX2_CRYPTO_PUBLICKEYBYTES 54
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG128FAST_AVX2_CRYPTO_BYTES 12472L
+#define PQCLEAN_CROSSRSDPG128FAST_AVX2_CRYPTO_BYTES 12472
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG128FAST_AVX2_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdpg-128-fast_clean/api.h b/src/sig/cross/upcross_cross-rsdpg-128-fast_clean/api.h
index 22eddea31..29a0a982b 100644
--- a/src/sig/cross/upcross_cross-rsdpg-128-fast_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-128-fast_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG128FAST_CLEAN_CRYPTO_ALGNAME "cross-rsdpg-128-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG128FAST_CLEAN_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDPG128FAST_CLEAN_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG128FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 54L
+#define PQCLEAN_CROSSRSDPG128FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 54
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG128FAST_CLEAN_CRYPTO_BYTES 12472L
+#define PQCLEAN_CROSSRSDPG128FAST_CLEAN_CRYPTO_BYTES 12472
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG128FAST_CLEAN_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdpg-128-small_avx2/api.h b/src/sig/cross/upcross_cross-rsdpg-128-small_avx2/api.h
index 19ea1c3ed..8e80266d4 100644
--- a/src/sig/cross/upcross_cross-rsdpg-128-small_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-128-small_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG128SMALL_AVX2_CRYPTO_ALGNAME "cross-rsdpg-128-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG128SMALL_AVX2_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDPG128SMALL_AVX2_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG128SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 54L
+#define PQCLEAN_CROSSRSDPG128SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 54
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG128SMALL_AVX2_CRYPTO_BYTES 7956L
+#define PQCLEAN_CROSSRSDPG128SMALL_AVX2_CRYPTO_BYTES 7956
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG128SMALL_AVX2_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdpg-128-small_clean/api.h b/src/sig/cross/upcross_cross-rsdpg-128-small_clean/api.h
index cf9782d0f..6e5247b0a 100644
--- a/src/sig/cross/upcross_cross-rsdpg-128-small_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-128-small_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG128SMALL_CLEAN_CRYPTO_ALGNAME "cross-rsdpg-128-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG128SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 32L
+#define PQCLEAN_CROSSRSDPG128SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 32
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG128SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 54L
+#define PQCLEAN_CROSSRSDPG128SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 54
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG128SMALL_CLEAN_CRYPTO_BYTES 7956L
+#define PQCLEAN_CROSSRSDPG128SMALL_CLEAN_CRYPTO_BYTES 7956
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG128SMALL_CLEAN_CRYPTO_RANDOMBYTES 16
diff --git a/src/sig/cross/upcross_cross-rsdpg-192-balanced_avx2/api.h b/src/sig/cross/upcross_cross-rsdpg-192-balanced_avx2/api.h
index 59585a176..7990c3cec 100644
--- a/src/sig/cross/upcross_cross-rsdpg-192-balanced_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-192-balanced_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG192BALANCED_AVX2_CRYPTO_ALGNAME "cross-rsdpg-192-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG192BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDPG192BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG192BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 83L
+#define PQCLEAN_CROSSRSDPG192BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 83
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG192BALANCED_AVX2_CRYPTO_BYTES 23380L
+#define PQCLEAN_CROSSRSDPG192BALANCED_AVX2_CRYPTO_BYTES 23380
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG192BALANCED_AVX2_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdpg-192-balanced_clean/api.h b/src/sig/cross/upcross_cross-rsdpg-192-balanced_clean/api.h
index b7bd1c9a0..11d1dbf03 100644
--- a/src/sig/cross/upcross_cross-rsdpg-192-balanced_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-192-balanced_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG192BALANCED_CLEAN_CRYPTO_ALGNAME "cross-rsdpg-192-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG192BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDPG192BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG192BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 83L
+#define PQCLEAN_CROSSRSDPG192BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 83
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG192BALANCED_CLEAN_CRYPTO_BYTES 23380L
+#define PQCLEAN_CROSSRSDPG192BALANCED_CLEAN_CRYPTO_BYTES 23380
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG192BALANCED_CLEAN_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdpg-192-fast_avx2/api.h b/src/sig/cross/upcross_cross-rsdpg-192-fast_avx2/api.h
index 507e985a1..0b0ca6c17 100644
--- a/src/sig/cross/upcross_cross-rsdpg-192-fast_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-192-fast_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG192FAST_AVX2_CRYPTO_ALGNAME "cross-rsdpg-192-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG192FAST_AVX2_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDPG192FAST_AVX2_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG192FAST_AVX2_CRYPTO_PUBLICKEYBYTES 83L
+#define PQCLEAN_CROSSRSDPG192FAST_AVX2_CRYPTO_PUBLICKEYBYTES 83
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG192FAST_AVX2_CRYPTO_BYTES 27404L
+#define PQCLEAN_CROSSRSDPG192FAST_AVX2_CRYPTO_BYTES 27404
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG192FAST_AVX2_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdpg-192-fast_clean/api.h b/src/sig/cross/upcross_cross-rsdpg-192-fast_clean/api.h
index 0f4441992..09cf2c18b 100644
--- a/src/sig/cross/upcross_cross-rsdpg-192-fast_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-192-fast_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG192FAST_CLEAN_CRYPTO_ALGNAME "cross-rsdpg-192-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG192FAST_CLEAN_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDPG192FAST_CLEAN_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG192FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 83L
+#define PQCLEAN_CROSSRSDPG192FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 83
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG192FAST_CLEAN_CRYPTO_BYTES 27404L
+#define PQCLEAN_CROSSRSDPG192FAST_CLEAN_CRYPTO_BYTES 27404
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG192FAST_CLEAN_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdpg-192-small_avx2/api.h b/src/sig/cross/upcross_cross-rsdpg-192-small_avx2/api.h
index 340d9a235..13feb806f 100644
--- a/src/sig/cross/upcross_cross-rsdpg-192-small_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-192-small_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG192SMALL_AVX2_CRYPTO_ALGNAME "cross-rsdpg-192-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG192SMALL_AVX2_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDPG192SMALL_AVX2_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG192SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 83L
+#define PQCLEAN_CROSSRSDPG192SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 83
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG192SMALL_AVX2_CRYPTO_BYTES 18188L
+#define PQCLEAN_CROSSRSDPG192SMALL_AVX2_CRYPTO_BYTES 18188
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG192SMALL_AVX2_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdpg-192-small_clean/api.h b/src/sig/cross/upcross_cross-rsdpg-192-small_clean/api.h
index 89aed1c28..201933a0f 100644
--- a/src/sig/cross/upcross_cross-rsdpg-192-small_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-192-small_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG192SMALL_CLEAN_CRYPTO_ALGNAME "cross-rsdpg-192-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG192SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 48L
+#define PQCLEAN_CROSSRSDPG192SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 48
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG192SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 83L
+#define PQCLEAN_CROSSRSDPG192SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 83
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG192SMALL_CLEAN_CRYPTO_BYTES 18188L
+#define PQCLEAN_CROSSRSDPG192SMALL_CLEAN_CRYPTO_BYTES 18188
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG192SMALL_CLEAN_CRYPTO_RANDOMBYTES 24
diff --git a/src/sig/cross/upcross_cross-rsdpg-256-balanced_avx2/api.h b/src/sig/cross/upcross_cross-rsdpg-256-balanced_avx2/api.h
index 78dc3518a..6f0763a1b 100644
--- a/src/sig/cross/upcross_cross-rsdpg-256-balanced_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-256-balanced_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG256BALANCED_AVX2_CRYPTO_ALGNAME "cross-rsdpg-256-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG256BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDPG256BALANCED_AVX2_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG256BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 106L
+#define PQCLEAN_CROSSRSDPG256BALANCED_AVX2_CRYPTO_PUBLICKEYBYTES 106
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG256BALANCED_AVX2_CRYPTO_BYTES 40134L
+#define PQCLEAN_CROSSRSDPG256BALANCED_AVX2_CRYPTO_BYTES 40134
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG256BALANCED_AVX2_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdpg-256-balanced_clean/api.h b/src/sig/cross/upcross_cross-rsdpg-256-balanced_clean/api.h
index 2d42320ea..1d4a717a4 100644
--- a/src/sig/cross/upcross_cross-rsdpg-256-balanced_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-256-balanced_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG256BALANCED_CLEAN_CRYPTO_ALGNAME "cross-rsdpg-256-balanced"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG256BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDPG256BALANCED_CLEAN_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG256BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 106L
+#define PQCLEAN_CROSSRSDPG256BALANCED_CLEAN_CRYPTO_PUBLICKEYBYTES 106
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG256BALANCED_CLEAN_CRYPTO_BYTES 40134L
+#define PQCLEAN_CROSSRSDPG256BALANCED_CLEAN_CRYPTO_BYTES 40134
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG256BALANCED_CLEAN_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdpg-256-fast_avx2/api.h b/src/sig/cross/upcross_cross-rsdpg-256-fast_avx2/api.h
index c5ffcbdfd..f6eebda03 100644
--- a/src/sig/cross/upcross_cross-rsdpg-256-fast_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-256-fast_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG256FAST_AVX2_CRYPTO_ALGNAME "cross-rsdpg-256-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG256FAST_AVX2_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDPG256FAST_AVX2_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG256FAST_AVX2_CRYPTO_PUBLICKEYBYTES 106L
+#define PQCLEAN_CROSSRSDPG256FAST_AVX2_CRYPTO_PUBLICKEYBYTES 106
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG256FAST_AVX2_CRYPTO_BYTES 48938L
+#define PQCLEAN_CROSSRSDPG256FAST_AVX2_CRYPTO_BYTES 48938
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG256FAST_AVX2_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdpg-256-fast_clean/api.h b/src/sig/cross/upcross_cross-rsdpg-256-fast_clean/api.h
index 3d1b2a6a9..b56c43b14 100644
--- a/src/sig/cross/upcross_cross-rsdpg-256-fast_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-256-fast_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG256FAST_CLEAN_CRYPTO_ALGNAME "cross-rsdpg-256-fast"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG256FAST_CLEAN_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDPG256FAST_CLEAN_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG256FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 106L
+#define PQCLEAN_CROSSRSDPG256FAST_CLEAN_CRYPTO_PUBLICKEYBYTES 106
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG256FAST_CLEAN_CRYPTO_BYTES 48938L
+#define PQCLEAN_CROSSRSDPG256FAST_CLEAN_CRYPTO_BYTES 48938
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG256FAST_CLEAN_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdpg-256-small_avx2/api.h b/src/sig/cross/upcross_cross-rsdpg-256-small_avx2/api.h
index f452add49..8fe0618a1 100644
--- a/src/sig/cross/upcross_cross-rsdpg-256-small_avx2/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-256-small_avx2/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG256SMALL_AVX2_CRYPTO_ALGNAME "cross-rsdpg-256-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG256SMALL_AVX2_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDPG256SMALL_AVX2_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG256SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 106L
+#define PQCLEAN_CROSSRSDPG256SMALL_AVX2_CRYPTO_PUBLICKEYBYTES 106
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG256SMALL_AVX2_CRYPTO_BYTES 32742L
+#define PQCLEAN_CROSSRSDPG256SMALL_AVX2_CRYPTO_BYTES 32742
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG256SMALL_AVX2_CRYPTO_RANDOMBYTES 32
diff --git a/src/sig/cross/upcross_cross-rsdpg-256-small_clean/api.h b/src/sig/cross/upcross_cross-rsdpg-256-small_clean/api.h
index 21df57b7c..e92f34099 100644
--- a/src/sig/cross/upcross_cross-rsdpg-256-small_clean/api.h
+++ b/src/sig/cross/upcross_cross-rsdpg-256-small_clean/api.h
@@ -34,13 +34,13 @@
 #define PQCLEAN_CROSSRSDPG256SMALL_CLEAN_CRYPTO_ALGNAME "cross-rsdpg-256-small"
 
 /*  no. of bytes of the secret key */
-#define PQCLEAN_CROSSRSDPG256SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 64L
+#define PQCLEAN_CROSSRSDPG256SMALL_CLEAN_CRYPTO_SECRETKEYBYTES 64
 
 /*  no. of bytes of the public key */
-#define PQCLEAN_CROSSRSDPG256SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 106L
+#define PQCLEAN_CROSSRSDPG256SMALL_CLEAN_CRYPTO_PUBLICKEYBYTES 106
 
 /* no. of bytes of overhead in a signed message */
-#define PQCLEAN_CROSSRSDPG256SMALL_CLEAN_CRYPTO_BYTES 32742L
+#define PQCLEAN_CROSSRSDPG256SMALL_CLEAN_CRYPTO_BYTES 32742
 
 /* required bytes of input randomness */
 #define PQCLEAN_CROSSRSDPG256SMALL_CLEAN_CRYPTO_RANDOMBYTES 32