change from unsigned long long to size_t

PQCMayo · Feb 28, 2024 · 5002c0c · 5002c0c
1 parent 530e2b0
commit 5002c0c
Show file tree

Hide file tree

Showing 20 changed files with 117 additions and 114 deletions.
diff --git a/apps/PQCgenKAT_sign.c b/apps/PQCgenKAT_sign.c
@@ -46,7 +46,7 @@ protection within the United States.
 
 int FindMarker(FILE *infile, const char *marker);
 int ReadHex(FILE *infile, unsigned char *A, int Length, char *str);
-void fprintBstr(FILE *fp, char *S, unsigned char *A, unsigned long long L);
+void fprintBstr(FILE *fp, char *S, unsigned char *A, size_t L);
 
 int main(void) {
   char fn_req[32], fn_rsp[32];
@@ -55,7 +55,7 @@ int main(void) {
   unsigned char msg[3300];
   unsigned char entropy_input[48];
   unsigned char *m, *sm, *m1;
-  unsigned long long mlen, smlen, mlen1;
+  size_t mlen, smlen, mlen1;
   int count;
   int done;
   unsigned char pk[CRYPTO_PUBLICKEYBYTES], sk[CRYPTO_SECRETKEYBYTES];
@@ -84,7 +84,7 @@ int main(void) {
     randombytes(seed, 48);
     fprintBstr(fp_req, "seed = ", seed, 48);
     mlen = 33 * (i + 1);
-    fprintf(fp_req, "mlen = %llu\n", mlen);
+    fprintf(fp_req, "mlen = %zu\n", mlen);
     randombytes(msg, mlen);
     fprintBstr(fp_req, "msg = ", msg, mlen);
     fprintf(fp_req, "pk =\n");
@@ -121,13 +121,13 @@ int main(void) {
     randombytes_init(seed, NULL, 256);
 
     if (FindMarker(fp_req, "mlen = ")) {
-      if (fscanf(fp_req, "%llu", &mlen) != 1)
+      if (fscanf(fp_req, "%zu", &mlen) != 1)
         return KAT_DATA_ERROR;
     } else {
       printf("ERROR: unable to read 'mlen' from <%s>\n", fn_req);
       return KAT_DATA_ERROR;
     }
-    fprintf(fp_rsp, "mlen = %llu\n", mlen);
+    fprintf(fp_rsp, "mlen = %zu\n", mlen);
 
     m = (unsigned char *)calloc(mlen, sizeof(unsigned char));
     m1 = (unsigned char *)calloc(mlen + CRYPTO_BYTES, sizeof(unsigned char));
@@ -151,7 +151,7 @@ int main(void) {
       printf("crypto_sign returned <%d>\n", ret_val);
       return KAT_CRYPTO_FAILURE;
     }
-    fprintf(fp_rsp, "smlen = %llu\n", smlen);
+    fprintf(fp_rsp, "smlen = %zu\n", smlen);
     fprintBstr(fp_rsp, "sm = ", sm, smlen);
     fprintf(fp_rsp, "\n");
 
@@ -162,7 +162,7 @@ int main(void) {
 
     if (mlen != mlen1) {
       printf(
-          "crypto_sign_open returned bad 'mlen': Got <%llu>, expected <%llu>\n",
+          "crypto_sign_open returned bad 'mlen': Got <%zu>, expected <%zu>\n",
           mlen1, mlen);
       return KAT_CRYPTO_FAILURE;
     }
@@ -265,8 +265,8 @@ int ReadHex(FILE *infile, unsigned char *A, int Length, char *str) {
   return 1;
 }
 
-void fprintBstr(FILE *fp, char *S, unsigned char *A, unsigned long long L) {
-  unsigned long long i;
+void fprintBstr(FILE *fp, char *S, unsigned char *A, size_t L) {
+  size_t i;
 
   fprintf(fp, "%s", S);
 

diff --git a/apps/example.c b/apps/example.c
@@ -24,8 +24,8 @@
  */
 static int example_mayo(const mayo_params_t* p) {
 
-    unsigned long long msglen = 32;
-    unsigned long long smlen = PARAM_sig_bytes(p) + msglen;
+    size_t msglen = 32;
+    size_t smlen = PARAM_sig_bytes(p) + msglen;
 
     unsigned char *pk  = calloc(PARAM_cpk_bytes(p), 1);
     unsigned char *sk  = calloc(PARAM_csk_bytes(p), 1);

diff --git a/apps/example_nistapi.c b/apps/example_nistapi.c
@@ -20,9 +20,9 @@
  */
 static int example_mayo(void) {
 
-    unsigned long long msglen = 32;
-    unsigned long long smlen = CRYPTO_BYTES + msglen;
-    unsigned long long siglen = CRYPTO_BYTES;
+    size_t msglen = 32;
+    size_t smlen = CRYPTO_BYTES + msglen;
+    size_t siglen = CRYPTO_BYTES;
 
     unsigned char *pk  = calloc(CRYPTO_PUBLICKEYBYTES, 1);
     unsigned char *sk  = calloc(CRYPTO_SECRETKEYBYTES, 1);

diff --git a/include/mayo.h b/include/mayo.h
@@ -4,6 +4,7 @@
 #define MAYO_H
 
 #include <stdint.h>
+#include <stdlib.h>
 
 #define F_TAIL_LEN 5
 #define F_TAIL_64                                                              \
@@ -321,8 +322,8 @@ int mayo_keypair(const mayo_params_t *p, unsigned char *pk, unsigned char *sk);
 
 #define mayo_sign_signature MAYO_NAMESPACE(mayo_sign_signature)
 int mayo_sign_signature(const mayo_params_t *p, unsigned char *sig,
-              unsigned long long *siglen, const unsigned char *m,
-              unsigned long long mlen, const unsigned char *csk);
+              size_t *siglen, const unsigned char *m,
+              size_t mlen, const unsigned char *csk);
 
 /**
  * MAYO signature generation.
@@ -341,8 +342,8 @@ int mayo_sign_signature(const mayo_params_t *p, unsigned char *sig,
  */
 #define mayo_sign MAYO_NAMESPACE(mayo_sign)
 int mayo_sign(const mayo_params_t *p, unsigned char *sm,
-              unsigned long long *smlen, const unsigned char *m,
-              unsigned long long mlen, const unsigned char *sk);
+              size_t *smlen, const unsigned char *m,
+              size_t mlen, const unsigned char *sk);
 
 /**
  * Mayo open signature.
@@ -361,8 +362,8 @@ int mayo_sign(const mayo_params_t *p, unsigned char *sm,
  */
 #define mayo_open MAYO_NAMESPACE(mayo_open)
 int mayo_open(const mayo_params_t *p, unsigned char *m,
-              unsigned long long *mlen, const unsigned char *sm,
-              unsigned long long smlen, const unsigned char *pk);
+              size_t *mlen, const unsigned char *sm,
+              size_t smlen, const unsigned char *pk);
 
 /**
  * Mayo compact keypair generation.
@@ -427,7 +428,7 @@ int mayo_expand_sk(const mayo_params_t *p, const unsigned char *csk,
  */
 #define mayo_verify MAYO_NAMESPACE(mayo_verify)
 int mayo_verify(const mayo_params_t *p, const unsigned char *m,
-                unsigned long long mlen, const unsigned char *sig,
+                size_t mlen, const unsigned char *sig,
                 const unsigned char *pk);
 
 #endif
diff --git a/include/randombytes.h b/include/randombytes.h
@@ -3,6 +3,8 @@
 #ifndef randombytes_h
 #define randombytes_h
 
+#include <stdlib.h>
+
 /**
  * Randombytes initialization.
  * Initialization may be needed for some random number generators (e.g. CTR-DRBG).
@@ -23,6 +25,6 @@ void randombytes_init(unsigned char *entropy_input,
  * @param[in] xlen Number of random bytes to be generated
  * @return int 0 on success, -1 otherwise
  */
-int randombytes(unsigned char *x, unsigned long long xlen);
+int randombytes(unsigned char *x, size_t xlen);
 
 #endif /* randombytes_h */
diff --git a/src/common/randombytes_ctrdrbg.c b/src/common/randombytes_ctrdrbg.c
@@ -124,7 +124,7 @@ AES256_CTR_DRBG_Update(unsigned char *provided_data,
     memcpy(V, temp + 32, 16);
 }
 
-int randombytes(unsigned char *random_array, unsigned long long nbytes) {
+int randombytes(unsigned char *random_array, size_t nbytes) {
     int ret = randombytes_nist(random_array, nbytes);
 #ifdef ENABLE_CT_TESTING
     VALGRIND_MAKE_MEM_UNDEFINED(random_array, ret);

diff --git a/src/common/randombytes_system.c b/src/common/randombytes_system.c
@@ -380,7 +380,7 @@ static int randombytes_select(void *buf, size_t n)
 #endif
 }
 
-int randombytes(unsigned char *x, unsigned long long xlen) {
+int randombytes(unsigned char *x, size_t xlen) {
 
     int ret = randombytes_select(x, (size_t) xlen);
 #ifdef ENABLE_CT_TESTING

diff --git a/src/mayo.c b/src/mayo.c
@@ -254,8 +254,8 @@ int mayo_keypair(const mayo_params_t *p, unsigned char *pk, unsigned char *sk) {
 }
 
 int mayo_sign_signature(const mayo_params_t *p, unsigned char *sig,
-              unsigned long long *siglen, const unsigned char *m,
-              unsigned long long mlen, const unsigned char *csk) {
+              size_t *siglen, const unsigned char *m,
+              size_t mlen, const unsigned char *csk) {
     int ret = MAYO_OK;
     unsigned char tenc[M_BYTES_MAX], t[M_MAX]; // no secret data
     unsigned char y[M_MAX];                    // secret data
@@ -399,13 +399,13 @@ int mayo_sign_signature(const mayo_params_t *p, unsigned char *sig,
 }
 
 int mayo_sign(const mayo_params_t *p, unsigned char *sm,
-              unsigned long long *smlen, const unsigned char *m,
-              unsigned long long mlen, const unsigned char *csk) {
+              size_t *smlen, const unsigned char *m,
+              size_t mlen, const unsigned char *csk) {
     int ret = MAYO_OK;
     const int param_sig_bytes = PARAM_sig_bytes(p);
-    unsigned long long siglen = param_sig_bytes;
+    size_t siglen = param_sig_bytes;
     ret = mayo_sign_signature(p, sm, &siglen, m, mlen, csk);
-    if (ret != MAYO_OK || siglen != (unsigned long long) param_sig_bytes)
+    if (ret != MAYO_OK || siglen != (size_t) param_sig_bytes)
         goto err;
 
     memmove(sm + param_sig_bytes, m, mlen);
@@ -415,10 +415,10 @@ int mayo_sign(const mayo_params_t *p, unsigned char *sm,
 }
 
 int mayo_open(const mayo_params_t *p, unsigned char *m,
-              unsigned long long *mlen, const unsigned char *sm,
-              unsigned long long smlen, const unsigned char *pk) {
+              size_t *mlen, const unsigned char *sm,
+              size_t smlen, const unsigned char *pk) {
     const int param_sig_bytes = PARAM_sig_bytes(p);
-    if (smlen < (unsigned long long)param_sig_bytes) {
+    if (smlen < (size_t)param_sig_bytes) {
         return MAYO_ERR;
     }
     int result = mayo_verify(p, sm + param_sig_bytes, smlen - param_sig_bytes, sm,
@@ -582,7 +582,7 @@ int mayo_expand_sk(const mayo_params_t *p, const unsigned char *csk,
 }
 
 int mayo_verify(const mayo_params_t *p, const unsigned char *m,
-                unsigned long long mlen, const unsigned char *sig,
+                size_t mlen, const unsigned char *sig,
                 const unsigned char *cpk) {
     unsigned char tEnc[M_BYTES_MAX];
     unsigned char t[M_MAX];

diff --git a/src/mayo_1/api.c b/src/mayo_1/api.c
@@ -16,29 +16,29 @@ crypto_sign_keypair(unsigned char *pk, unsigned char *sk) {
 
 #ifndef PQM4
 int
-crypto_sign(unsigned char *sm, unsigned long long *smlen,
-            const unsigned char *m, unsigned long long mlen,
+crypto_sign(unsigned char *sm, size_t *smlen,
+            const unsigned char *m, size_t mlen,
             const unsigned char *sk) {
     return mayo_sign(MAYO_PARAMS, sm, smlen, m, mlen, sk);
 }
 
 int
 crypto_sign_signature(unsigned char *sig,
-              unsigned long long *siglen, const unsigned char *m,
-              unsigned long long mlen, const unsigned char *sk) {
+              size_t *siglen, const unsigned char *m,
+              size_t mlen, const unsigned char *sk) {
     return mayo_sign_signature(MAYO_PARAMS, sig, siglen, m, mlen, sk);
 }
 
 int
-crypto_sign_open(unsigned char *m, unsigned long long *mlen,
-                 const unsigned char *sm, unsigned long long smlen,
+crypto_sign_open(unsigned char *m, size_t *mlen,
+                 const unsigned char *sm, size_t smlen,
                  const unsigned char *pk) {
     return mayo_open(MAYO_PARAMS, m, mlen, sm, smlen, pk);
 }
 
 int
-crypto_sign_verify(const unsigned char *sig, unsigned long long siglen,
-                   const unsigned char *m, unsigned long long mlen,
+crypto_sign_verify(const unsigned char *sig, size_t siglen,
+                   const unsigned char *m, size_t mlen,
                    const unsigned char *pk) {
     if (siglen != CRYPTO_BYTES)
         return -1;
@@ -50,7 +50,7 @@ crypto_sign(unsigned char *sm, size_t *smlen,
             const unsigned char *m, size_t mlen,
             const unsigned char *sk) {
 
-    unsigned long long smlen_ll;
+    size_t smlen_ll;
     int rc = mayo_sign(MAYO_PARAMS, sm, &smlen_ll, m, mlen, sk);
     *smlen = smlen_ll;
     return rc;
@@ -60,7 +60,7 @@ int
 crypto_sign_open(unsigned char *m, size_t *mlen,
                  const unsigned char *sm, size_t smlen,
                  const unsigned char *pk) {
-    unsigned long long mlen_ll;
+    size_t mlen_ll;
     int rc = mayo_open(MAYO_PARAMS, m, &mlen_ll, sm, smlen, pk);
     *mlen = mlen_ll;
     return rc;

diff --git a/src/mayo_1/api.h b/src/mayo_1/api.h
@@ -19,26 +19,26 @@ crypto_sign_keypair(unsigned char *pk, unsigned char *sk);
 #ifndef PQM4
 #define crypto_sign MAYO_NAMESPACE(crypto_sign)
 int
-crypto_sign(unsigned char *sm, unsigned long long *smlen,
-            const unsigned char *m, unsigned long long mlen,
+crypto_sign(unsigned char *sm, size_t *smlen,
+            const unsigned char *m, size_t mlen,
             const unsigned char *sk);
 
 #define crypto_sign_signature MAYO_NAMESPACE(crypto_sign_signature)
 int
 crypto_sign_signature(unsigned char *sig,
-              unsigned long long *siglen, const unsigned char *m,
-              unsigned long long mlen, const unsigned char *sk);
+              size_t *siglen, const unsigned char *m,
+              size_t mlen, const unsigned char *sk);
 
 #define crypto_sign_open MAYO_NAMESPACE(crypto_sign_open)
 int
-crypto_sign_open(unsigned char *m, unsigned long long *mlen,
-                 const unsigned char *sm, unsigned long long smlen,
+crypto_sign_open(unsigned char *m, size_t *mlen,
+                 const unsigned char *sm, size_t smlen,
                  const unsigned char *pk);
 
 #define crypto_sign_verify MAYO_NAMESPACE(crypto_sign_verify)
 int
-crypto_sign_verify(const unsigned char *sig, unsigned long long siglen,
-                   const unsigned char *m, unsigned long long mlen,
+crypto_sign_verify(const unsigned char *sig, size_t siglen,
+                   const unsigned char *m, size_t mlen,
                    const unsigned char *pk);
 #else
 #include <stddef.h>

diff --git a/src/mayo_2/api.c b/src/mayo_2/api.c
@@ -16,29 +16,29 @@ crypto_sign_keypair(unsigned char *pk, unsigned char *sk) {
 
 #ifndef PQM4
 int
-crypto_sign(unsigned char *sm, unsigned long long *smlen,
-            const unsigned char *m, unsigned long long mlen,
+crypto_sign(unsigned char *sm, size_t *smlen,
+            const unsigned char *m, size_t mlen,
             const unsigned char *sk) {
     return mayo_sign(MAYO_PARAMS, sm, smlen, m, mlen, sk);
 }
 
 int
 crypto_sign_signature(unsigned char *sig,
-              unsigned long long *siglen, const unsigned char *m,
-              unsigned long long mlen, const unsigned char *sk) {
+              size_t *siglen, const unsigned char *m,
+              size_t mlen, const unsigned char *sk) {
     return mayo_sign_signature(MAYO_PARAMS, sig, siglen, m, mlen, sk);
 }
 
 int
-crypto_sign_open(unsigned char *m, unsigned long long *mlen,
-                 const unsigned char *sm, unsigned long long smlen,
+crypto_sign_open(unsigned char *m, size_t *mlen,
+                 const unsigned char *sm, size_t smlen,
                  const unsigned char *pk) {
     return mayo_open(MAYO_PARAMS, m, mlen, sm, smlen, pk);
 }
 
 int
-crypto_sign_verify(const unsigned char *sig, unsigned long long siglen,
-                   const unsigned char *m, unsigned long long mlen,
+crypto_sign_verify(const unsigned char *sig, size_t siglen,
+                   const unsigned char *m, size_t mlen,
                    const unsigned char *pk) {
     if (siglen != CRYPTO_BYTES)
         return -1;
@@ -50,7 +50,7 @@ crypto_sign(unsigned char *sm, size_t *smlen,
             const unsigned char *m, size_t mlen,
             const unsigned char *sk) {
 
-    unsigned long long smlen_ll;
+    size_t smlen_ll;
     int rc = mayo_sign(MAYO_PARAMS, sm, &smlen_ll, m, mlen, sk);
     *smlen = smlen_ll;
     return rc;
@@ -60,7 +60,7 @@ int
 crypto_sign_open(unsigned char *m, size_t *mlen,
                  const unsigned char *sm, size_t smlen,
                  const unsigned char *pk) {
-    unsigned long long mlen_ll;
+    size_t mlen_ll;
     int rc = mayo_open(MAYO_PARAMS, m, &mlen_ll, sm, smlen, pk);
     *mlen = mlen_ll;
     return rc;