Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / gcrypt / cipher.c

diff --git a/src/gcrypt/cipher.c b/src/gcrypt/cipher.c
index f8668da..8306531 100644 (file)
--- a/src/gcrypt/cipher.c
+++ b/src/gcrypt/cipher.c
@@ -102,7 +102,7 @@ static bool cipher_open(cipher_t *cipher, int algo, int mode) {
        }
 
        if((err = gcry_cipher_open(&cipher->handle, algo, mode, 0))) {
-               logger(DEBUG_ALWAYS, LOG_DEBUG, "Unable to intialise cipher %d mode %d: %s", algo, mode, gcry_strerror(err));
+               logger(DEBUG_ALWAYS, LOG_DEBUG, "Unable to initialise cipher %d mode %d: %s", algo, mode, gcry_strerror(err));
                return false;
        }
 
@@ -146,10 +146,8 @@ void cipher_close(cipher_t *cipher) {
                cipher->handle = NULL;
        }
 
-       if(cipher->key) {
-               free(cipher->key);
-               cipher->key = NULL;
-       }
+       free(cipher->key);
+       cipher->key = NULL;
 }
 
 size_t cipher_keylength(const cipher_t *cipher) {
@@ -263,7 +261,7 @@ bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
 
                size_t origlen = inlen - padbyte;
 
-               for(int i = inlen - 1; i >= origlen; i--)
+               for(size_t i = inlen - 1; i >= origlen; i--)
                        if(((uint8_t *)outdata)[i] != padbyte) {
                                logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting: invalid padding");
                                return false;