Reformat all code using astyle.

[tinc] / src / nolegacy / prf.c

diff --git a/src/nolegacy/prf.c b/src/nolegacy/prf.c
index 1937f67..ce80f8c 100644 (file)
--- a/src/nolegacy/prf.c
+++ b/src/nolegacy/prf.c
@@ -23,8 +23,9 @@
 #include "../ed25519/sha512.h"
 
 static void memxor(char *buf, char c, size_t len) {
-       for(size_t i = 0; i < len; i++)
+       for(size_t i = 0; i < len; i++) {
                buf[i] ^= c;
+       }
 }
 
 static const size_t mdlen = 64;
@@ -38,30 +39,39 @@ static bool hmac_sha512(const char *key, size_t keylen, const char *msg, size_t
                memcpy(tmp, key, keylen);
                memset(tmp + keylen, 0, blklen - keylen);
        } else {
-               if(sha512(key, keylen, tmp) != 0)
+               if(sha512(key, keylen, tmp) != 0) {
                        return false;
+               }
+
                memset(tmp + mdlen, 0, blklen - mdlen);
        }
 
-       if(sha512_init(&md) != 0)
+       if(sha512_init(&md) != 0) {
                return false;
+       }
 
        // ipad
        memxor(tmp, 0x36, blklen);
-       if(sha512_update(&md, tmp, blklen) != 0)
+
+       if(sha512_update(&md, tmp, blklen) != 0) {
                return false;
+       }
 
        // message
-       if(sha512_update(&md, msg, msglen) != 0)
+       if(sha512_update(&md, msg, msglen) != 0) {
                return false;
+       }
 
-       if(sha512_final(&md, tmp + blklen) != 0)
+       if(sha512_final(&md, tmp + blklen) != 0) {
                return false;
+       }
 
        // opad
        memxor(tmp, 0x36 ^ 0x5c, blklen);
-       if(sha512(tmp, sizeof(tmp), out) != 0)
+
+       if(sha512(tmp, sizeof(tmp), out) != 0) {
                return false;
+       }
 
        return true;
 }
@@ -84,18 +94,23 @@ bool prf(const char *secret, size_t secretlen, char *seed, size_t seedlen, char
 
        while(outlen > 0) {
                /* Inner HMAC */
-               if(!hmac_sha512(secret, secretlen, data, sizeof(data), data))
+               if(!hmac_sha512(secret, secretlen, data, sizeof(data), data)) {
                        return false;
+               }
 
                /* Outer HMAC */
                if(outlen >= mdlen) {
-                       if(!hmac_sha512(secret, secretlen, data, sizeof(data), out))
+                       if(!hmac_sha512(secret, secretlen, data, sizeof(data), out)) {
                                return false;
+                       }
+
                        out += mdlen;
                        outlen -= mdlen;
                } else {
-                       if(!hmac_sha512(secret, secretlen, data, sizeof(data), hash))
+                       if(!hmac_sha512(secret, secretlen, data, sizeof(data), hash)) {
                                return false;
+                       }
+
                        memcpy(out, hash, outlen);
                        out += outlen;
                        outlen = 0;