hreese/exim-encrypt-dlfunc
1
0
Fork 0
mirror of https://gitlab.kit.edu/kit/scc/sys/mail/exim-encrypt-dlfunc.git synced 2025-12-06 10:03:56 +01:00
Code Issues Releases Wiki Activity

Changed unsigned int to size_t where appropriate (see #4)

Browse Source
This commit is contained in:
Heiko Reese
2021-08-20 23:10:15 +02:00
parent 05d5a5080d
commit 3a437a5bf0
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libexim-encrypt-dlfunc.c
View File

@ -57,7 +57,7 @@ int sodium_crypto_secretbox_encrypt_password(uschar **yield, int argc, uschar *a
password, passwordlen, NULL, 0); password, passwordlen, NULL, 0);
// prepare buffer for ciphertext // 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); unsigned char *ciphertext = (unsigned char *) store_get_untainted(cipherlen);
sodium_memzero(ciphertext, 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); memcpy(&combined_message[crypto_secretbox_NONCEBYTES], ciphertext, cipherlen);
// base64-encode the ciphertext // base64-encode the ciphertext
unsigned int outputsize = sodium_base64_ENCODED_LEN(combined_message_len, size_t outputsize = sodium_base64_ENCODED_LEN(combined_message_len,
sodium_base64_VARIANT_ORIGINAL); sodium_base64_VARIANT_ORIGINAL);
unsigned char *outstring = (unsigned char *) store_get_untainted(outputsize); unsigned char *outstring = (unsigned char *) store_get_untainted(outputsize);
//sodium_memzero(outstring, outputsize); //sodium_memzero(outstring, outputsize);
sodium_bin2base64((char *const) 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); memcpy(nonce, combined_message, crypto_secretbox_NONCEBYTES);
// prepare buffer for cleartext // 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); unsigned char *cleartext = (unsigned char *) store_get_untainted(cleartextlen + 1);
sodium_memzero(cleartext, 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]; unsigned char *pkb64 = argv[0];
size_t pkb64_len = strlen((const char *) pkb64); size_t pkb64_len = strlen((const char *) pkb64);
// reserve space for conversion // 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); unsigned char *pk = (unsigned char *) store_get_untainted(pk_buffer_len);
sodium_memzero(pk, pk_buffer_len); sodium_memzero(pk, pk_buffer_len);
// convert encoded key to raw form // 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); size_t messagelen = strlen((const char *) message);
// prepare buffer for ciphertext // 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); unsigned char *ciphertext = store_get_untainted(cipherlen);
sodium_memzero(ciphertext, cipherlen); sodium_memzero(ciphertext, cipherlen);
@ -210,8 +210,8 @@ int sodium_crypto_box_seal(uschar **yield, int argc, uschar *argv[]) {
} }
// base64-encode the ciphertext // base64-encode the ciphertext
unsigned int outputsize = sodium_base64_ENCODED_LEN(cipherlen, size_t outputsize = sodium_base64_ENCODED_LEN(cipherlen,
sodium_base64_VARIANT_ORIGINAL); sodium_base64_VARIANT_ORIGINAL);
unsigned char *outstring = store_get_untainted(outputsize); unsigned char *outstring = store_get_untainted(outputsize);
sodium_bin2base64((char *const) outstring, outputsize, sodium_bin2base64((char *const) outstring, outputsize,
ciphertext, cipherlen, ciphertext, cipherlen,
@ -245,7 +245,7 @@ int sodium_crypto_box_seal_open(uschar **yield, int argc, uschar *argv[]) {
unsigned char *skb64 = argv[0]; unsigned char *skb64 = argv[0];
size_t skb64_len = strlen((const char *) skb64); size_t skb64_len = strlen((const char *) skb64);
// reserve space for conversion // 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); unsigned char *sk = (unsigned char *) store_get_untainted(sk_buffer_len);
sodium_memzero(sk, sk_buffer_len); sodium_memzero(sk, sk_buffer_len);
// convert encoded key to raw form // 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]; unsigned char *pkb64 = argv[1];
size_t pkb64_len = strlen((const char *) pkb64); size_t pkb64_len = strlen((const char *) pkb64);
// reserve space for conversion // 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); unsigned char *pk = (unsigned char *) store_get_untainted(pk_buffer_len);
sodium_memzero(pk, pk_buffer_len); sodium_memzero(pk, pk_buffer_len);
// convert encoded key to raw form // 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); size_t ciphertextb64_len = strlen((const char *) ciphertextb64);
// base64-decode the ciphertext // 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); unsigned char *ciphertext = (unsigned char *) store_get_untainted(ciphertextbuflen);
size_t ciphertextlen; size_t ciphertextlen;
sodium_memzero(ciphertext, ciphertextbuflen); sodium_memzero(ciphertext, ciphertextbuflen);
@ -292,7 +292,7 @@ int sodium_crypto_box_seal_open(uschar **yield, int argc, uschar *argv[]) {
} }
// prepare buffer for cleartext // 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); unsigned char *cleartext = (unsigned char *) store_get_untainted(cleartextlen + 1);
sodium_memzero(cleartext, cleartextlen + 1); sodium_memzero(cleartext, cleartextlen + 1);