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 CFLAGS := -std=c11 $(SHARED_FLAGS) -Wmissing-prototypes
CXXFLAGS := -std=c++14 $(SHARED_FLAGS) CXXFLAGS := -std=c++14 $(SHARED_FLAGS)
LDFLAGS := -Wl,-z,defs,-z,relro,-z,now,-z,nodlopen,-z,text 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 SOURCES := chacha.c malloc.c memory.c pages.c random.c util.c
OBJECTS := $(SOURCES:.c=.o) OBJECTS := $(SOURCES:.c=.o)

132
chacha.c
View File

@ -1,8 +1,6 @@
/* // Based on chacha-merged.c version 20080118
Based on chacha-merged.c version 20080118 // D. J. Bernstein
D. J. Bernstein // Public domain.
Public domain.
*/
#include "chacha.h" #include "chacha.h"
@ -16,34 +14,33 @@ Public domain.
(U32V((v) << (n)) | ((v) >> (32 - (n)))) (U32V((v) << (n)) | ((v) >> (32 - (n))))
#define U8TO32_LITTLE(p) \ #define U8TO32_LITTLE(p) \
(((u32)((p)[0]) ) | \ (((u32)((p)[0])) | \
((u32)((p)[1]) << 8) | \ ((u32)((p)[1]) << 8) | \
((u32)((p)[2]) << 16) | \ ((u32)((p)[2]) << 16) | \
((u32)((p)[3]) << 24)) ((u32)((p)[3]) << 24))
#define U32TO8_LITTLE(p, v) \ #define U32TO8_LITTLE(p, v) \
do { \ do { \
(p)[0] = U8V((v) ); \ (p)[0] = U8V((v)); \
(p)[1] = U8V((v) >> 8); \ (p)[1] = U8V((v) >> 8); \
(p)[2] = U8V((v) >> 16); \ (p)[2] = U8V((v) >> 16); \
(p)[3] = U8V((v) >> 24); \ (p)[3] = U8V((v) >> 24); \
} while (0) } while (0)
#define ROTATE(v,c) (ROTL32(v,c)) #define ROTATE(v, c) (ROTL32(v, c))
#define XOR(v,w) ((v) ^ (w)) #define XOR(v, w) ((v) ^ (w))
#define PLUS(v,w) (U32V((v) + (w))) #define PLUS(v, w) (U32V((v) + (w)))
#define PLUSONE(v) (PLUS((v),1)) #define PLUSONE(v) (PLUS((v), 1))
#define QUARTERROUND(a,b,c,d) \ #define QUARTERROUND(a, b, c, d) \
a = PLUS(a,b); d = ROTATE(XOR(d,a),16); \ a = PLUS(a, b); d = ROTATE(XOR(d, a), 16); \
c = PLUS(c,d); b = ROTATE(XOR(b,c),12); \ c = PLUS(c, d); b = ROTATE(XOR(b, c), 12); \
a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \ a = PLUS(a, b); d = ROTATE(XOR(d, a), 8); \
c = PLUS(c,d); b = ROTATE(XOR(b,c), 7); c = PLUS(c, d); b = ROTATE(XOR(b, c), 7);
static const char sigma[16] = "expand 32-byte k"; 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[0] = U8TO32_LITTLE(sigma + 0);
x->input[1] = U8TO32_LITTLE(sigma + 4); x->input[1] = U8TO32_LITTLE(sigma + 4);
x->input[2] = U8TO32_LITTLE(sigma + 8); 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); 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[12] = 0;
x->input[13] = 0; x->input[13] = 0;
x->input[14] = U8TO32_LITTLE(iv + 0); x->input[14] = U8TO32_LITTLE(iv + 0);
x->input[15] = U8TO32_LITTLE(iv + 4); x->input[15] = U8TO32_LITTLE(iv + 4);
} }
void void chacha_keystream_bytes(chacha_ctx *x, u8 *c, u32 bytes) {
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 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; u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
u8 *ctarget; u8 *ctarget;
u8 tmp[64]; u8 tmp[64];
unsigned i; unsigned i;
if (!bytes) return; if (!bytes) {
return;
}
j0 = x->input[0]; j0 = x->input[0];
j1 = x->input[1]; j1 = x->input[1];
@ -115,59 +111,61 @@ chacha_keystream_bytes(chacha_ctx *x,u8 *c,u32 bytes)
x13 = j13; x13 = j13;
x14 = j14; x14 = j14;
x15 = j15; x15 = j15;
for (i = 8;i > 0;i -= 2) { for (i = 8; i > 0; i -= 2) {
QUARTERROUND( x0, x4, x8,x12) QUARTERROUND(x0, x4, x8, x12)
QUARTERROUND( x1, x5, x9,x13) QUARTERROUND(x1, x5, x9, x13)
QUARTERROUND( x2, x6,x10,x14) QUARTERROUND(x2, x6, x10, x14)
QUARTERROUND( x3, x7,x11,x15) QUARTERROUND(x3, x7, x11, x15)
QUARTERROUND( x0, x5,x10,x15) QUARTERROUND(x0, x5, x10, x15)
QUARTERROUND( x1, x6,x11,x12) QUARTERROUND(x1, x6, x11, x12)
QUARTERROUND( x2, x7, x8,x13) QUARTERROUND(x2, x7, x8, x13)
QUARTERROUND( x3, x4, x9,x14) QUARTERROUND(x3, x4, x9, x14)
} }
x0 = PLUS(x0,j0); x0 = PLUS(x0, j0);
x1 = PLUS(x1,j1); x1 = PLUS(x1, j1);
x2 = PLUS(x2,j2); x2 = PLUS(x2, j2);
x3 = PLUS(x3,j3); x3 = PLUS(x3, j3);
x4 = PLUS(x4,j4); x4 = PLUS(x4, j4);
x5 = PLUS(x5,j5); x5 = PLUS(x5, j5);
x6 = PLUS(x6,j6); x6 = PLUS(x6, j6);
x7 = PLUS(x7,j7); x7 = PLUS(x7, j7);
x8 = PLUS(x8,j8); x8 = PLUS(x8, j8);
x9 = PLUS(x9,j9); x9 = PLUS(x9, j9);
x10 = PLUS(x10,j10); x10 = PLUS(x10, j10);
x11 = PLUS(x11,j11); x11 = PLUS(x11, j11);
x12 = PLUS(x12,j12); x12 = PLUS(x12, j12);
x13 = PLUS(x13,j13); x13 = PLUS(x13, j13);
x14 = PLUS(x14,j14); x14 = PLUS(x14, j14);
x15 = PLUS(x15,j15); x15 = PLUS(x15, j15);
j12 = PLUSONE(j12); j12 = PLUSONE(j12);
if (!j12) { if (!j12) {
j13 = PLUSONE(j13); 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); U32TO8_LITTLE(c + 0, x0);
U32TO8_LITTLE(c + 4,x1); U32TO8_LITTLE(c + 4, x1);
U32TO8_LITTLE(c + 8,x2); U32TO8_LITTLE(c + 8, x2);
U32TO8_LITTLE(c + 12,x3); U32TO8_LITTLE(c + 12, x3);
U32TO8_LITTLE(c + 16,x4); U32TO8_LITTLE(c + 16, x4);
U32TO8_LITTLE(c + 20,x5); U32TO8_LITTLE(c + 20, x5);
U32TO8_LITTLE(c + 24,x6); U32TO8_LITTLE(c + 24, x6);
U32TO8_LITTLE(c + 28,x7); U32TO8_LITTLE(c + 28, x7);
U32TO8_LITTLE(c + 32,x8); U32TO8_LITTLE(c + 32, x8);
U32TO8_LITTLE(c + 36,x9); U32TO8_LITTLE(c + 36, x9);
U32TO8_LITTLE(c + 40,x10); U32TO8_LITTLE(c + 40, x10);
U32TO8_LITTLE(c + 44,x11); U32TO8_LITTLE(c + 44, x11);
U32TO8_LITTLE(c + 48,x12); U32TO8_LITTLE(c + 48, x12);
U32TO8_LITTLE(c + 52,x13); U32TO8_LITTLE(c + 52, x13);
U32TO8_LITTLE(c + 56,x14); U32TO8_LITTLE(c + 56, x14);
U32TO8_LITTLE(c + 60,x15); U32TO8_LITTLE(c + 60, x15);
if (bytes <= 64) { if (bytes <= 64) {
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[12] = j12;
x->input[13] = j13; x->input[13] = j13;