From 9626d7af5934c5303a548b7cd63b2f0c2cf85e7c Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 23 Feb 2017 10:51:42 +0100 Subject: [PATCH] Indent, remove duplicate includes --- .../box_curve25519xchacha20poly1305.c | 105 ++++++++---------- .../box_curve25519xsalsa20poly1305.c | 53 ++++----- 2 files changed, 74 insertions(+), 84 deletions(-) diff --git a/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c b/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c index f71173f5..0d0965ed 100644 --- a/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c +++ b/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c @@ -1,21 +1,21 @@ #include #include -#include #include +#include #include "crypto_box_curve25519xchacha20poly1305.h" #include "crypto_core_hchacha20.h" #include "crypto_hash_sha512.h" -#include "crypto_secretbox_xchacha20poly1305.h" #include "crypto_scalarmult_curve25519.h" +#include "crypto_secretbox_xchacha20poly1305.h" #include "private/common.h" #include "randombytes.h" #include "utils.h" int -crypto_box_curve25519xchacha20poly1305_seed_keypair(unsigned char *pk, - unsigned char *sk, +crypto_box_curve25519xchacha20poly1305_seed_keypair(unsigned char * pk, + unsigned char * sk, const unsigned char *seed) { unsigned char hash[64]; @@ -39,7 +39,7 @@ crypto_box_curve25519xchacha20poly1305_keypair(unsigned char *pk, static const unsigned char n[16] = { 0 }; int -crypto_box_curve25519xchacha20poly1305_beforenm(unsigned char *k, +crypto_box_curve25519xchacha20poly1305_beforenm(unsigned char * k, const unsigned char *pk, const unsigned char *sk) { @@ -52,30 +52,24 @@ crypto_box_curve25519xchacha20poly1305_beforenm(unsigned char *k, } int -crypto_box_curve25519xchacha20poly1305_detached_afternm(unsigned char *c, - unsigned char *mac, - const unsigned char *m, - unsigned long long mlen, - const unsigned char *n, - const unsigned char *k) +crypto_box_curve25519xchacha20poly1305_detached_afternm( + unsigned char *c, unsigned char *mac, const unsigned char *m, + unsigned long long mlen, const unsigned char *n, const unsigned char *k) { return crypto_secretbox_xchacha20poly1305_detached(c, mac, m, mlen, n, k); } int -crypto_box_curve25519xchacha20poly1305_detached(unsigned char *c, - unsigned char *mac, - const unsigned char *m, - unsigned long long mlen, - const unsigned char *n, - const unsigned char *pk, - const unsigned char *sk) +crypto_box_curve25519xchacha20poly1305_detached( + unsigned char *c, unsigned char *mac, const unsigned char *m, + unsigned long long mlen, const unsigned char *n, const unsigned char *pk, + const unsigned char *sk) { unsigned char k[crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES]; int ret; - COMPILER_ASSERT(crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES - >= crypto_secretbox_xchacha20poly1305_KEYBYTES); + COMPILER_ASSERT(crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES >= + crypto_secretbox_xchacha20poly1305_KEYBYTES); if (crypto_box_curve25519xchacha20poly1305_beforenm(k, pk, sk) != 0) { return -1; } @@ -87,9 +81,9 @@ crypto_box_curve25519xchacha20poly1305_detached(unsigned char *c, } int -crypto_box_curve25519xchacha20poly1305_easy_afternm(unsigned char *c, +crypto_box_curve25519xchacha20poly1305_easy_afternm(unsigned char * c, const unsigned char *m, - unsigned long long mlen, + unsigned long long mlen, const unsigned char *n, const unsigned char *k) { @@ -101,12 +95,9 @@ crypto_box_curve25519xchacha20poly1305_easy_afternm(unsigned char *c, } int -crypto_box_curve25519xchacha20poly1305_easy(unsigned char *c, - const unsigned char *m, - unsigned long long mlen, - const unsigned char *n, - const unsigned char *pk, - const unsigned char *sk) +crypto_box_curve25519xchacha20poly1305_easy( + unsigned char *c, const unsigned char *m, unsigned long long mlen, + const unsigned char *n, const unsigned char *pk, const unsigned char *sk) { if (mlen > SIZE_MAX - crypto_box_curve25519xchacha20poly1305_MACBYTES) { return -1; @@ -117,24 +108,19 @@ crypto_box_curve25519xchacha20poly1305_easy(unsigned char *c, } int -crypto_box_curve25519xchacha20poly1305_open_detached_afternm(unsigned char *m, - const unsigned char *c, - const unsigned char *mac, - unsigned long long clen, - const unsigned char *n, - const unsigned char *k) +crypto_box_curve25519xchacha20poly1305_open_detached_afternm( + unsigned char *m, const unsigned char *c, const unsigned char *mac, + unsigned long long clen, const unsigned char *n, const unsigned char *k) { - return crypto_secretbox_xchacha20poly1305_open_detached(m, c, mac, clen, n, k); + return crypto_secretbox_xchacha20poly1305_open_detached(m, c, mac, clen, n, + k); } int -crypto_box_curve25519xchacha20poly1305_open_detached(unsigned char *m, - const unsigned char *c, - const unsigned char *mac, - unsigned long long clen, - const unsigned char *n, - const unsigned char *pk, - const unsigned char *sk) +crypto_box_curve25519xchacha20poly1305_open_detached( + unsigned char *m, const unsigned char *c, const unsigned char *mac, + unsigned long long clen, const unsigned char *n, const unsigned char *pk, + const unsigned char *sk) { unsigned char k[crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES]; int ret; @@ -150,11 +136,9 @@ crypto_box_curve25519xchacha20poly1305_open_detached(unsigned char *m, } int -crypto_box_curve25519xchacha20poly1305_open_easy_afternm(unsigned char *m, - const unsigned char *c, - unsigned long long clen, - const unsigned char *n, - const unsigned char *k) +crypto_box_curve25519xchacha20poly1305_open_easy_afternm( + unsigned char *m, const unsigned char *c, unsigned long long clen, + const unsigned char *n, const unsigned char *k) { if (clen < crypto_box_curve25519xchacha20poly1305_MACBYTES) { return -1; @@ -165,12 +149,9 @@ crypto_box_curve25519xchacha20poly1305_open_easy_afternm(unsigned char *m, } int -crypto_box_curve25519xchacha20poly1305_open_easy(unsigned char *m, - const unsigned char *c, - unsigned long long clen, - const unsigned char *n, - const unsigned char *pk, - const unsigned char *sk) +crypto_box_curve25519xchacha20poly1305_open_easy( + unsigned char *m, const unsigned char *c, unsigned long long clen, + const unsigned char *n, const unsigned char *pk, const unsigned char *sk) { if (clen < crypto_box_curve25519xchacha20poly1305_MACBYTES) { return -1; @@ -181,31 +162,37 @@ crypto_box_curve25519xchacha20poly1305_open_easy(unsigned char *m, } size_t -crypto_box_curve25519xchacha20poly1305_seedbytes(void) { +crypto_box_curve25519xchacha20poly1305_seedbytes(void) +{ return crypto_box_curve25519xchacha20poly1305_SEEDBYTES; } size_t -crypto_box_curve25519xchacha20poly1305_publickeybytes(void) { +crypto_box_curve25519xchacha20poly1305_publickeybytes(void) +{ return crypto_box_curve25519xchacha20poly1305_PUBLICKEYBYTES; } size_t -crypto_box_curve25519xchacha20poly1305_secretkeybytes(void) { +crypto_box_curve25519xchacha20poly1305_secretkeybytes(void) +{ return crypto_box_curve25519xchacha20poly1305_SECRETKEYBYTES; } size_t -crypto_box_curve25519xchacha20poly1305_beforenmbytes(void) { +crypto_box_curve25519xchacha20poly1305_beforenmbytes(void) +{ return crypto_box_curve25519xchacha20poly1305_BEFORENMBYTES; } size_t -crypto_box_curve25519xchacha20poly1305_noncebytes(void) { +crypto_box_curve25519xchacha20poly1305_noncebytes(void) +{ return crypto_box_curve25519xchacha20poly1305_NONCEBYTES; } size_t -crypto_box_curve25519xchacha20poly1305_macbytes(void) { +crypto_box_curve25519xchacha20poly1305_macbytes(void) +{ return crypto_box_curve25519xchacha20poly1305_MACBYTES; } diff --git a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c index 54dcaef1..61f02053 100644 --- a/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c +++ b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c @@ -5,13 +5,12 @@ #include "crypto_hash_sha512.h" #include "crypto_scalarmult_curve25519.h" #include "crypto_secretbox_xsalsa20poly1305.h" -#include "crypto_scalarmult_curve25519.h" #include "randombytes.h" #include "utils.h" int -crypto_box_curve25519xsalsa20poly1305_seed_keypair(unsigned char *pk, - unsigned char *sk, +crypto_box_curve25519xsalsa20poly1305_seed_keypair(unsigned char * pk, + unsigned char * sk, const unsigned char *seed) { unsigned char hash[64]; @@ -35,7 +34,7 @@ crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk, static const unsigned char n[16] = { 0 }; int -crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k, +crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char * k, const unsigned char *pk, const unsigned char *sk) { @@ -48,9 +47,9 @@ crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k, } int -crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c, +crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char * c, const unsigned char *m, - unsigned long long mlen, + unsigned long long mlen, const unsigned char *n, const unsigned char *k) { @@ -58,9 +57,9 @@ crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c, } int -crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m, +crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char * m, const unsigned char *c, - unsigned long long clen, + unsigned long long clen, const unsigned char *n, const unsigned char *k) { @@ -68,9 +67,8 @@ crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m, } int -crypto_box_curve25519xsalsa20poly1305(unsigned char *c, - const unsigned char *m, - unsigned long long mlen, +crypto_box_curve25519xsalsa20poly1305(unsigned char *c, const unsigned char *m, + unsigned long long mlen, const unsigned char *n, const unsigned char *pk, const unsigned char *sk) @@ -88,12 +86,9 @@ crypto_box_curve25519xsalsa20poly1305(unsigned char *c, } int -crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m, - const unsigned char *c, - unsigned long long clen, - const unsigned char *n, - const unsigned char *pk, - const unsigned char *sk) +crypto_box_curve25519xsalsa20poly1305_open( + unsigned char *m, const unsigned char *c, unsigned long long clen, + const unsigned char *n, const unsigned char *pk, const unsigned char *sk) { unsigned char k[crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES]; int ret; @@ -108,41 +103,49 @@ crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m, } size_t -crypto_box_curve25519xsalsa20poly1305_seedbytes(void) { +crypto_box_curve25519xsalsa20poly1305_seedbytes(void) +{ return crypto_box_curve25519xsalsa20poly1305_SEEDBYTES; } size_t -crypto_box_curve25519xsalsa20poly1305_publickeybytes(void) { +crypto_box_curve25519xsalsa20poly1305_publickeybytes(void) +{ return crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES; } size_t -crypto_box_curve25519xsalsa20poly1305_secretkeybytes(void) { +crypto_box_curve25519xsalsa20poly1305_secretkeybytes(void) +{ return crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES; } size_t -crypto_box_curve25519xsalsa20poly1305_beforenmbytes(void) { +crypto_box_curve25519xsalsa20poly1305_beforenmbytes(void) +{ return crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES; } size_t -crypto_box_curve25519xsalsa20poly1305_noncebytes(void) { +crypto_box_curve25519xsalsa20poly1305_noncebytes(void) +{ return crypto_box_curve25519xsalsa20poly1305_NONCEBYTES; } size_t -crypto_box_curve25519xsalsa20poly1305_zerobytes(void) { +crypto_box_curve25519xsalsa20poly1305_zerobytes(void) +{ return crypto_box_curve25519xsalsa20poly1305_ZEROBYTES; } size_t -crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void) { +crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void) +{ return crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES; } size_t -crypto_box_curve25519xsalsa20poly1305_macbytes(void) { +crypto_box_curve25519xsalsa20poly1305_macbytes(void) +{ return crypto_box_curve25519xsalsa20poly1305_MACBYTES; }