scip/twenty4
1
0
Fork 0
mirror of https://codeberg.org/scip/twenty4.git synced 2025-12-16 19:40:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
TLINDEN
2015-10-05 23:25:52 +02:00
parent 73f3cd65e8
commit 2d34fd47e0
2 changed files with 46 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@@ -10,16 +10,28 @@ all: $(DST)
$(DST): $(OBJS) $(DST): $(OBJS)
gcc $(LDFLAGS) $(OBJS) -o $(DST) gcc $(LDFLAGS) $(OBJS) -o $(DST)
@rm -f x
%.o: %.c %.o: %.c
gcc -c $(CFLAGS) $*.c -o $*.o gcc -c $(CFLAGS) $*.c -o $*.o
clean: clean:
rm -f *.o $(DST) *.core rm -f *.o $(DST) *.core zero x*
cd analyze && make clean cd analyze && make clean
cd sbox && make clean cd sbox && make clean
test: test: $(DST) zero x decrypttest antest enttest
@echo "run 'make dietest' for dieharder tests, use screen"
zero:
dd if=/dev/zero of=zero bs=1024 count=10000
x:
cat zero | ./twenty4 00000000000000000001 1 > x
decrypttest: $(DST)
sha256 LICENSE | cut -f 4 -d ' ' > .xsum sha256 LICENSE | cut -f 4 -d ' ' > .xsum
cat LICENSE | ./$(DST) $(K) X > .xenc cat LICENSE | ./$(DST) $(K) X > .xenc
cat .xenc | ./$(DST) $(K) X > .xdec cat .xenc | ./$(DST) $(K) X > .xdec
@@ -27,18 +39,18 @@ test:
if test "x`cat .xsum`" = "x`cat .xnsum`"; then echo OK; else echo FAIL; fi if test "x`cat .xsum`" = "x`cat .xnsum`"; then echo OK; else echo FAIL; fi
rm -f .x* rm -f .x*
./divtest.sh ./divtest.sh
@echo
rngtest:
@dd if=/dev/zero of=zero bs=1024 count=10000
@cat zero | ./twenty4 00000000000000000001 1 > x
# my own # my own
antest: $(DST) zero x
analyze/analyze x analyze/analyze x
@echo @echo
# ent from: http://www.fourmilab.ch/random/ # ent from: http://www.fourmilab.ch/random/
enttest: $(DST) x
ent x ent x
@echo @echo
# dieharder from: https://www.phy.duke.edu/~rgb/General/dieharder.php # dieharder from: https://www.phy.duke.edu/~rgb/General/dieharder.php
dietest: $(DST)
dd if=/dev/zero of=/dev/stdout | ./twenty4 00000000000000000001 1 | dieharder -g 200 -a dd if=/dev/zero of=/dev/stdout | ./twenty4 00000000000000000001 1 | dieharder -g 200 -a

49
twenty4.c
View File

@@ -46,7 +46,23 @@ const uint8_t sbox[16][16] = {
{ 0x50, 0x6b, 0xc9, 0x46, 0x57, 0x5c, 0x69, 0x79, 0x82, 0xf1, 0x27, 0x38, 0x34, 0xf6, 0x00, 0xa9 } { 0x50, 0x6b, 0xc9, 0x46, 0x57, 0x5c, 0x69, 0x79, 0x82, 0xf1, 0x27, 0x38, 0x34, 0xf6, 0x00, 0xa9 }
}; };
/*
constants used to diffuse key (context)
- the 32bits are random Sofie Germain primes
- the 64bit is Carmichael number(fermat pseudoprime),
see https://oeis.org/A255578
- the small x*'s are Sofie Germain primes as well
*/
#define SGP_LCG 0x85f62713
#define SGP_D1U 0xc178f733
#define SGP_DEC 0x49a79a73
#define MP_SHI 0xf87d06b3b0871fc1
#define xRotBy 29
#define xSwapBy 11
#define xLeftBy 53
#define xRotNonce 7
/* convert a 64bit number into an 8 element byte array */ /* convert a 64bit number into an 8 element byte array */
void w2a(u64 in, uint8_t *out) { void w2a(u64 in, uint8_t *out) {
@@ -128,11 +144,6 @@ u64 fwd_prngs() {
u64 combined64a() { u64 combined64a() {
u32 _x; u32 _x;
u64 use, xorshift; u64 use, xorshift;
int xSwap, xRot, xRotBy;
xSwap = 11; /* Sofie Germain primes as well */
xRot = 29;
xRotBy = 53;
xorshift = fwd_prngs(); xorshift = fwd_prngs();
@@ -145,16 +156,16 @@ u64 combined64a() {
use = xorshift ^ (((u64)context->lcg << 32) + context->d1u); use = xorshift ^ (((u64)context->lcg << 32) + context->d1u);
} }
if((context->decide & 0xFF) % xSwap == 0) { if((context->decide & 0xFF) % xSwapBy == 0) {
/* re-seed 32bit registers by swapping them */ /* re-seed 32bit registers by swapping them */
_x = context->lcg; _x = context->lcg;
context->lcg = context->d1u; context->lcg = context->d1u;
context->d1u = _x; context->d1u = _x;
} }
if((context->decide & 0xFF) % xRot == 0) { if((context->decide & 0xFF) % xRotBy == 0) {
// rotate 64t left // rotate 64t left
context->shift = rot64left(context->shift, (context->decide & 0xFF) % xRotBy); context->shift = rot64left(context->shift, (context->decide & 0xFF) % xLeftBy);
} }
return use; return use;
@@ -164,7 +175,7 @@ void dumpk(ctx *k) {
fprintf(stderr, " lcg: %04X\n", k->lcg); fprintf(stderr, " lcg: %04X\n", k->lcg);
fprintf(stderr, " d1u: %04X\n", k->d1u); fprintf(stderr, " d1u: %04X\n", k->d1u);
fprintf(stderr, " decide: %04X\n", k->decide); fprintf(stderr, " decide: %04X\n", k->decide);
fprintf(stderr, " shift: %" PRIX64 "\n", k->shift); fprintf(stderr, " shift: %" PRIX64 "\n--\n", k->shift);
} }
/* convert 20 byte hex string into 160 bit key (= context) */ /* convert 20 byte hex string into 160 bit key (= context) */
@@ -201,19 +212,13 @@ ctx *parseargs(char *arg) {
/* diffuse context with prime numbers */ /* diffuse context with prime numbers */
void diffuse_context() { void diffuse_context() {
/* 32bits are random Sofie Germain primes,
64bit is a Carmichael number(fermat pseudoprime), see
https://oeis.org/A255578
diffuse input key with those primes
*/
u32 tmplcg; u32 tmplcg;
int i, xRotBy = 29; int i;
context->lcg ^= 0x85f62713; context->lcg ^= SGP_LCG;
context->d1u ^= 0xc178f733; context->d1u ^= SGP_D1U;
context->decide ^= 0x49a79a73; context->decide ^= SGP_DEC;
context->shift ^= 17905475062325518273U; context->shift ^= MP_SHI;
for(i=0; i<7; i++) { for(i=0; i<7; i++) {
tmplcg = context->lcg; tmplcg = context->lcg;
@@ -239,8 +244,8 @@ void io_loop(byte nonce) {
out ^= apply_sbox(nonce); out ^= apply_sbox(nonce);
/* rotate nonce left by 7 bits sometimes */ /* rotate nonce left by 7 bits sometimes */
if(K[i] && K[i] % 53 == 0) { if(K[i] && K[i] % xLeftBy == 0) {
nonce = rot8left(nonce, 7); nonce = rot8left(nonce, xRotNonce);
} }
} }