jmb
/
hardened_malloc
mirror of https://github.com/GrapheneOS/hardened_malloc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use consistent code style in chacha.c

pull/65/head
Daniel Micay 2018-10-19 17:07:30 -04:00
parent 1d2c10f5bb
commit 173ed53539
2 changed files with 149 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -6,7 +6,7 @@ SHARED_FLAGS := -O2 -flto -fPIC -fvisibility=hidden -fno-plt -pipe -Wall -Wextra
CFLAGS := -std=c11 $(SHARED_FLAGS) -Wmissing-prototypes
CXXFLAGS := -std=c++14 $(SHARED_FLAGS)
LDFLAGS := -Wl,-z,defs,-z,relro,-z,now,-z,nodlopen,-z,text
TIDY_CHECKS := -checks=bugprone-*,-bugprone-macro-parentheses,cert-*,clang-analyzer-*,readability-*,-readability-braces-around-statements,-readability-else-after-return,-readability-inconsistent-declaration-parameter-name,-readability-named-parameter
TIDY_CHECKS := -checks=bugprone-*,-bugprone-macro-parentheses,cert-*,clang-analyzer-*,readability-*,-readability-else-after-return,-readability-inconsistent-declaration-parameter-name,-readability-named-parameter
SOURCES := chacha.c malloc.c memory.c pages.c random.c util.c
OBJECTS := $(SOURCES:.c=.o)

28
chacha.c
View File

@ -1,8 +1,6 @@
/*
Based on chacha-merged.c version 20080118
D. J. Bernstein
Public domain.
*/
// Based on chacha-merged.c version 20080118
// D. J. Bernstein
// Public domain.
#include "chacha.h"
@ -42,8 +40,7 @@ Public domain.
static const char sigma[16] = "expand 32-byte k";
void chacha_keysetup(chacha_ctx *x,const u8 *k)
{
void chacha_keysetup(chacha_ctx *x, const u8 *k) {
x->input[0] = U8TO32_LITTLE(sigma + 0);
x->input[1] = U8TO32_LITTLE(sigma + 4);
x->input[2] = U8TO32_LITTLE(sigma + 8);
@ -58,24 +55,23 @@ void chacha_keysetup(chacha_ctx *x,const u8 *k)
x->input[11] = U8TO32_LITTLE(k + 28);
}
void chacha_ivsetup(chacha_ctx *x,const u8 *iv)
{
void chacha_ivsetup(chacha_ctx *x, const u8 *iv) {
x->input[12] = 0;
x->input[13] = 0;
x->input[14] = U8TO32_LITTLE(iv + 0);
x->input[15] = U8TO32_LITTLE(iv + 4);
}
void
chacha_keystream_bytes(chacha_ctx *x,u8 *c,u32 bytes)
{
void chacha_keystream_bytes(chacha_ctx *x, u8 *c, u32 bytes) {
u32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15;
u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
u8 *ctarget;
u8 tmp[64];
unsigned i;
if (!bytes) return;
if (!bytes) {
return;
}
j0 = x->input[0];
j1 = x->input[1];
@ -145,7 +141,7 @@ chacha_keystream_bytes(chacha_ctx *x,u8 *c,u32 bytes)
j12 = PLUSONE(j12);
if (!j12) {
j13 = PLUSONE(j13);
/* stopping at 2^70 bytes per nonce is user's responsibility */
// stopping at 2^70 bytes per nonce is user's responsibility
}
U32TO8_LITTLE(c + 0, x0);
@ -167,7 +163,9 @@ chacha_keystream_bytes(chacha_ctx *x,u8 *c,u32 bytes)
if (bytes <= 64) {
if (bytes < 64) {
for (i = 0;i < bytes;++i) ctarget[i] = c[i];
for (i = 0; i < bytes; ++i) {
ctarget[i] = c[i];
}
}
x->input[12] = j12;
x->input[13] = j13;