Fix spelling errors.

[tinc] / src / gcrypt / cipher.c

diff --git a/src/gcrypt/cipher.c b/src/gcrypt/cipher.c
index 6a2cc5a..176b62b 100644 (file)
--- a/src/gcrypt/cipher.c
+++ b/src/gcrypt/cipher.c
@@ -1,6 +1,6 @@
 /*
     cipher.c -- Symmetric block cipher handling
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@ static struct {
 static bool nametocipher(const char *name, int *algo, int *mode) {
        size_t i;
 
-       for(i = 0; i < sizeof ciphertable / sizeof *ciphertable; i++) {
+       for(i = 0; i < sizeof(ciphertable) / sizeof(*ciphertable); i++) {
                if(ciphertable[i].name && !strcasecmp(name, ciphertable[i].name)) {
                        *algo = ciphertable[i].algo;
                        *mode = ciphertable[i].mode;
@@ -69,7 +69,7 @@ static bool nametocipher(const char *name, int *algo, int *mode) {
 static bool nidtocipher(int nid, int *algo, int *mode) {
        size_t i;
 
-       for(i = 0; i < sizeof ciphertable / sizeof *ciphertable; i++) {
+       for(i = 0; i < sizeof(ciphertable) / sizeof(*ciphertable); i++) {
                if(nid == ciphertable[i].nid) {
                        *algo = ciphertable[i].algo;
                        *mode = ciphertable[i].mode;
@@ -83,7 +83,7 @@ static bool nidtocipher(int nid, int *algo, int *mode) {
 static bool ciphertonid(int algo, int mode, int *nid) {
        size_t i;
 
-       for(i = 0; i < sizeof ciphertable / sizeof *ciphertable; i++) {
+       for(i = 0; i < sizeof(ciphertable) / sizeof(*ciphertable); i++) {
                if(algo == ciphertable[i].algo && mode == ciphertable[i].mode) {
                        *nid = ciphertable[i].nid;
                        return true;
@@ -97,12 +97,12 @@ static bool cipher_open(cipher_t *cipher, int algo, int mode) {
        gcry_error_t err;
 
        if(!ciphertonid(algo, mode, &cipher->nid)) {
-               logger(LOG_DEBUG, "Cipher %d mode %d has no corresponding nid!", algo, mode);
+               logger(DEBUG_ALWAYS, LOG_DEBUG, "Cipher %d mode %d has no corresponding nid!", algo, mode);
                return false;
        }
 
        if((err = gcry_cipher_open(&cipher->handle, algo, mode, 0))) {
-               logger(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;
        }
 
@@ -118,7 +118,7 @@ bool cipher_open_by_name(cipher_t *cipher, const char *name) {
        int algo, mode;
 
        if(!nametocipher(name, &algo, &mode)) {
-               logger(LOG_DEBUG, "Unknown cipher name '%s'!", name);
+               logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown cipher name '%s'!", name);
                return false;
        }
 
@@ -129,7 +129,7 @@ bool cipher_open_by_nid(cipher_t *cipher, int nid) {
        int algo, mode;
 
        if(!nidtocipher(nid, &algo, &mode)) {
-               logger(LOG_DEBUG, "Unknown cipher ID %d!", nid);
+               logger(DEBUG_ALWAYS, LOG_DEBUG, "Unknown cipher ID %d!", nid);
                return false;
        }
 
@@ -193,13 +193,14 @@ bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
        uint8_t pad[cipher->blklen];
 
        if(cipher->padding) {
-               if(!oneshot)
+               if(!oneshot) {
                        return false;
+               }
 
                size_t reqlen = ((inlen + cipher->blklen) / cipher->blklen) * cipher->blklen;
 
                if(*outlen < reqlen) {
-                       logger(LOG_ERR, "Error while encrypting: not enough room for padding");
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting: not enough room for padding");
                        return false;
                }
 
@@ -207,23 +208,25 @@ bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
                inlen = reqlen - cipher->blklen;
 
                for(int i = 0; i < cipher->blklen; i++)
-                       if(i < cipher->blklen - padbyte)
+                       if(i < cipher->blklen - padbyte) {
                                pad[i] = ((uint8_t *)indata)[inlen + i];
-                       else
+                       } else {
                                pad[i] = padbyte;
+                       }
        }
-       
-       if(oneshot)
+
+       if(oneshot) {
                gcry_cipher_setiv(cipher->handle, cipher->key + cipher->keylen, cipher->blklen);
+       }
 
        if((err = gcry_cipher_encrypt(cipher->handle, outdata, *outlen, indata, inlen))) {
-               logger(LOG_ERR, "Error while encrypting: %s", gcry_strerror(err));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting: %s", gcry_strerror(err));
                return false;
        }
 
        if(cipher->padding) {
                if((err = gcry_cipher_encrypt(cipher->handle, outdata + inlen, cipher->blklen, pad, cipher->blklen))) {
-                       logger(LOG_ERR, "Error while encrypting: %s", gcry_strerror(err));
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting: %s", gcry_strerror(err));
                        return false;
                }
 
@@ -237,22 +240,24 @@ bool cipher_encrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
 bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *outdata, size_t *outlen, bool oneshot) {
        gcry_error_t err;
 
-       if(oneshot)
+       if(oneshot) {
                gcry_cipher_setiv(cipher->handle, cipher->key + cipher->keylen, cipher->blklen);
+       }
 
        if((err = gcry_cipher_decrypt(cipher->handle, outdata, *outlen, indata, inlen))) {
-               logger(LOG_ERR, "Error while decrypting: %s", gcry_strerror(err));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting: %s", gcry_strerror(err));
                return false;
        }
 
        if(cipher->padding) {
-               if(!oneshot)
+               if(!oneshot) {
                        return false;
+               }
 
                uint8_t padbyte = ((uint8_t *)outdata)[inlen - 1];
 
                if(padbyte == 0 || padbyte > cipher->blklen || padbyte > inlen) {
-                       logger(LOG_ERR, "Error while decrypting: invalid padding");
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting: invalid padding");
                        return false;
                }
 
@@ -260,13 +265,14 @@ bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
 
                for(int i = inlen - 1; i >= origlen; i--)
                        if(((uint8_t *)outdata)[i] != padbyte) {
-                               logger(LOG_ERR, "Error while decrypting: invalid padding");
+                               logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting: invalid padding");
                                return false;
                        }
 
                *outlen = origlen;
-       } else
+       } else {
                *outlen = inlen;
+       }
 
        return true;
 }