Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / gcrypt / rsa.c

diff --git a/src/gcrypt/rsa.c b/src/gcrypt/rsa.c
index eb9f58d..c026968 100644 (file)
--- a/src/gcrypt/rsa.c
+++ b/src/gcrypt/rsa.c
@@ -297,7 +297,8 @@ bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t len, void *out) {
        gcry_mpi_t outmpi = gcry_mpi_new(len * 8);
        gcry_mpi_powm(outmpi, inmpi, rsa->e, rsa->n);
 
-       int pad = len - (gcry_mpi_get_nbits(outmpi) + 7) / 8;
+       size_t out_bytes = (gcry_mpi_get_nbits(outmpi) + 7) / 8;
+       size_t pad = len - MIN(out_bytes, len);
 
        while(pad--) {
                *(char *)out++ = 0;
@@ -315,7 +316,7 @@ bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t len, void *out) {
        gcry_mpi_t outmpi = gcry_mpi_new(len * 8);
        gcry_mpi_powm(outmpi, inmpi, rsa->d, rsa->n);
 
-       int pad = len - (gcry_mpi_get_nbits(outmpi) + 7) / 8;
+       size_t pad = len - (gcry_mpi_get_nbits(outmpi) + 7) / 8;
 
        while(pad--) {
                *(char *)out++ = 0;