From 3a437a5bf0743e3f73788010de501a4e1753b073 Mon Sep 17 00:00:00 2001
From: Heiko Reese <heiko.reese@kit.edu>
Date: Fri, 20 Aug 2021 23:10:15 +0200
Subject: [PATCH] Changed unsigned int to size_t where appropriate (see #4)

---
 src/libexim-encrypt-dlfunc.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/libexim-encrypt-dlfunc.c b/src/libexim-encrypt-dlfunc.c
index c4913c4..504d1dc 100644
--- a/src/libexim-encrypt-dlfunc.c
+++ b/src/libexim-encrypt-dlfunc.c
@@ -57,7 +57,7 @@ int sodium_crypto_secretbox_encrypt_password(uschar **yield, int argc, uschar *a
                        password, passwordlen, NULL, 0);
 
     // prepare buffer for ciphertext
-    unsigned int cipherlen = messagelen + crypto_secretbox_MACBYTES;
+    size_t cipherlen = messagelen + crypto_secretbox_MACBYTES;
     unsigned char *ciphertext = (unsigned char *) store_get_untainted(cipherlen);
     sodium_memzero(ciphertext, cipherlen);
 
@@ -76,8 +76,8 @@ int sodium_crypto_secretbox_encrypt_password(uschar **yield, int argc, uschar *a
     memcpy(&combined_message[crypto_secretbox_NONCEBYTES], ciphertext, cipherlen);
 
     // base64-encode the ciphertext
-    unsigned int outputsize = sodium_base64_ENCODED_LEN(combined_message_len,
-                                                        sodium_base64_VARIANT_ORIGINAL);
+    size_t outputsize = sodium_base64_ENCODED_LEN(combined_message_len,
+                                                  sodium_base64_VARIANT_ORIGINAL);
     unsigned char *outstring = (unsigned char *) store_get_untainted(outputsize);
     //sodium_memzero(outstring, outputsize);
     sodium_bin2base64((char *const) outstring, outputsize,
@@ -141,7 +141,7 @@ int sodium_crypto_secretbox_decrypt_password(uschar **yield, int argc, uschar *a
     memcpy(nonce, combined_message, crypto_secretbox_NONCEBYTES);
 
     // prepare buffer for cleartext
-    unsigned int cleartextlen = combined_message_len - crypto_secretbox_NONCEBYTES - crypto_secretbox_MACBYTES;
+    size_t cleartextlen = combined_message_len - crypto_secretbox_NONCEBYTES - crypto_secretbox_MACBYTES;
     unsigned char *cleartext = (unsigned char *) store_get_untainted(cleartextlen + 1);
     sodium_memzero(cleartext, cleartextlen + 1);
 
@@ -182,7 +182,7 @@ int sodium_crypto_box_seal(uschar **yield, int argc, uschar *argv[]) {
     unsigned char *pkb64 = argv[0];
     size_t pkb64_len = strlen((const char *) pkb64);
     // reserve space for conversion
-    unsigned int pk_buffer_len = crypto_box_PUBLICKEYBYTES; // pkb64_len / 4 * 3 + 1;
+    size_t pk_buffer_len = crypto_box_PUBLICKEYBYTES; // pkb64_len / 4 * 3 + 1;
     unsigned char *pk = (unsigned char *) store_get_untainted(pk_buffer_len);
     sodium_memzero(pk, pk_buffer_len);
     // convert encoded key to raw form
@@ -199,7 +199,7 @@ int sodium_crypto_box_seal(uschar **yield, int argc, uschar *argv[]) {
     size_t messagelen = strlen((const char *) message);
 
     // prepare buffer for ciphertext
-    unsigned int cipherlen = messagelen + crypto_box_SEALBYTES;
+    size_t cipherlen = messagelen + crypto_box_SEALBYTES;
     unsigned char *ciphertext = store_get_untainted(cipherlen);
     sodium_memzero(ciphertext, cipherlen);
 
@@ -210,8 +210,8 @@ int sodium_crypto_box_seal(uschar **yield, int argc, uschar *argv[]) {
     }
 
     // base64-encode the ciphertext
-    unsigned int outputsize = sodium_base64_ENCODED_LEN(cipherlen,
-                                                        sodium_base64_VARIANT_ORIGINAL);
+    size_t outputsize = sodium_base64_ENCODED_LEN(cipherlen,
+                                                  sodium_base64_VARIANT_ORIGINAL);
     unsigned char *outstring = store_get_untainted(outputsize);
     sodium_bin2base64((char *const) outstring, outputsize,
                       ciphertext, cipherlen,
@@ -245,7 +245,7 @@ int sodium_crypto_box_seal_open(uschar **yield, int argc, uschar *argv[]) {
     unsigned char *skb64 = argv[0];
     size_t skb64_len = strlen((const char *) skb64);
     // reserve space for conversion
-    unsigned int sk_buffer_len = crypto_box_SECRETKEYBYTES;// skb64_len / 4 * 3;
+    size_t sk_buffer_len = crypto_box_SECRETKEYBYTES;// skb64_len / 4 * 3;
     unsigned char *sk = (unsigned char *) store_get_untainted(sk_buffer_len);
     sodium_memzero(sk, sk_buffer_len);
     // convert encoded key to raw form
@@ -261,7 +261,7 @@ int sodium_crypto_box_seal_open(uschar **yield, int argc, uschar *argv[]) {
     unsigned char *pkb64 = argv[1];
     size_t pkb64_len = strlen((const char *) pkb64);
     // reserve space for conversion
-    unsigned int pk_buffer_len = crypto_box_PUBLICKEYBYTES; // pkb64_len / 4 * 3;
+    size_t pk_buffer_len = crypto_box_PUBLICKEYBYTES; // pkb64_len / 4 * 3;
     unsigned char *pk = (unsigned char *) store_get_untainted(pk_buffer_len);
     sodium_memzero(pk, pk_buffer_len);
     // convert encoded key to raw form
@@ -278,7 +278,7 @@ int sodium_crypto_box_seal_open(uschar **yield, int argc, uschar *argv[]) {
     size_t ciphertextb64_len = strlen((const char *) ciphertextb64);
 
     // base64-decode the ciphertext
-    unsigned int ciphertextbuflen = ciphertextb64_len / 4 * 3;
+    size_t ciphertextbuflen = ciphertextb64_len / 4 * 3;
     unsigned char *ciphertext = (unsigned char *) store_get_untainted(ciphertextbuflen);
     size_t ciphertextlen;
     sodium_memzero(ciphertext, ciphertextbuflen);
@@ -292,7 +292,7 @@ int sodium_crypto_box_seal_open(uschar **yield, int argc, uschar *argv[]) {
     }
 
     // prepare buffer for cleartext
-    unsigned int cleartextlen = ciphertextlen - crypto_box_SEALBYTES;
+    size_t cleartextlen = ciphertextlen - crypto_box_SEALBYTES;
     unsigned char *cleartext = (unsigned char *) store_get_untainted(cleartextlen + 1);
     sodium_memzero(cleartext, cleartextlen + 1);