Skip to content

Commit

Permalink
format ALL the files
Browse files Browse the repository at this point in the history
  • Loading branch information
@friedger
friedger committed Oct 14, 2015
1 parent 732b413 commit 2f064ab
Show file tree
Hide file tree
Showing 62 changed files with 12,851 additions and 11,968 deletions.
302 changes: 152 additions & 150 deletions Safe/src/estreamj/ciphers/trivium/Trivium.java
View file
@@ -1,4 +1,3 @@

package estreamj.ciphers.trivium;

import estreamj.framework.ESJException;
Expand All @@ -7,45 +6,39 @@
import estreamj.framework.ICipherMaker;
import estreamj.framework.Utils;

public class Trivium implements ICipher
{
final static int KEY_SIZE_BITS = 80;
final static int IV_SIZE_BITS = 80;

///////////////////////////////////////////////////////////////////////////

byte[] key = new byte[10];
int[] s = new int[10];

///////////////////////////////////////////////////////////////////////////

public int getKeySize()
{
return KEY_SIZE_BITS >> 3;
}

public int getNonceSize()
{
return IV_SIZE_BITS >> 3;
}

public int getWordSize()
{
return 4;
}

public boolean isPatented()
{
return false;
}

public void process(
byte[] inbuf,
int inOfs,
byte[] outbuf,
int outOfs,
int len) throws ESJException
{
public class Trivium implements ICipher {
final static int KEY_SIZE_BITS = 80;
final static int IV_SIZE_BITS = 80;

///////////////////////////////////////////////////////////////////////////

byte[] key = new byte[10];
int[] s = new int[10];

///////////////////////////////////////////////////////////////////////////

public int getKeySize() {
return KEY_SIZE_BITS >> 3;
}

public int getNonceSize() {
return IV_SIZE_BITS >> 3;
}

public int getWordSize() {
return 4;
}

public boolean isPatented() {
return false;
}

public void process(
byte[] inbuf,
int inOfs,
byte[] outbuf,
int outOfs,
int len) throws ESJException {
int s11 = s[0];
int s12 = s[1];
int s13 = s[2];
Expand All @@ -56,60 +49,72 @@ public void process(
int s32 = s[7];
int s33 = s[8];
int s34 = s[9];

int outEnd = outOfs + (len & ~3);

for (; outOfs < outEnd; outOfs+=4, inOfs+=4)
{
int t1, t2, t3, reg;

t1 = ((s13 << 96-66) | (s12 >>> 66-64)) ^ ((s13 << 96-93 ) | (s12 >>> 93-64));
t2 = ((s23 << 96-69) | (s22 >>> 69-64)) ^ ((s23 << 96-84 ) | (s22 >>> 84-64));
t3 = ((s33 << 96-66) | (s32 >>> 66-64)) ^ ((s34 << 128-111) | (s33 >>> 111-96));


int outEnd = outOfs + (len & ~3);

for (; outOfs < outEnd; outOfs += 4, inOfs += 4) {
int t1, t2, t3, reg;

t1 = ((s13 << 96 - 66) | (s12 >>> 66 - 64)) ^ ((s13 << 96 - 93) | (s12 >>> 93 - 64));
t2 = ((s23 << 96 - 69) | (s22 >>> 69 - 64)) ^ ((s23 << 96 - 84) | (s22 >>> 84 - 64));
t3 = ((s33 << 96 - 66) | (s32 >>> 66 - 64)) ^ ((s34 << 128 - 111) | (s33 >>> 111 - 96));

reg = t1 ^ t2 ^ t3;
outbuf[outOfs ] = (byte)(inbuf[inOfs ] ^ reg);
outbuf[outOfs + 1] = (byte)(inbuf[inOfs + 1] ^ reg >> 8);
outbuf[outOfs + 2] = (byte)(inbuf[inOfs + 2] ^ reg >> 16);
outbuf[outOfs + 3] = (byte)(inbuf[inOfs + 3] ^ reg >> 24);

t1 ^= (((s13 << 96-91 ) | (s12 >>> 91-64)) & ((s13 << 96-92 ) | (s12 >>> 92-64))) ^ ((s23 << 96-78) | (s22 >>> 78-64));
t2 ^= (((s23 << 96-82 ) | (s22 >>> 82-64)) & ((s23 << 96-83 ) | (s22 >>> 83-64))) ^ ((s33 << 96-87) | (s32 >>> 87-64));
t3 ^= (((s34 << 128-109) | (s33 >>> 109-96)) & ((s34 << 128-110) | (s33 >>> 110-96))) ^ ((s13 << 96-69) | (s12 >>> 69-64));

s13 = s12; s12 = s11; s11 = t3;
s23 = s22; s22 = s21; s21 = t1;
s34 = s33; s33 = s32; s32 = s31; s31 = t2;
outbuf[outOfs] = (byte) (inbuf[inOfs] ^ reg);
outbuf[outOfs + 1] = (byte) (inbuf[inOfs + 1] ^ reg >> 8);
outbuf[outOfs + 2] = (byte) (inbuf[inOfs + 2] ^ reg >> 16);
outbuf[outOfs + 3] = (byte) (inbuf[inOfs + 3] ^ reg >> 24);

t1 ^= (((s13 << 96 - 91) | (s12 >>> 91 - 64)) & ((s13 << 96 - 92) | (s12 >>> 92 - 64))) ^ ((s23 << 96 - 78) | (s22 >>> 78 - 64));
t2 ^= (((s23 << 96 - 82) | (s22 >>> 82 - 64)) & ((s23 << 96 - 83) | (s22 >>> 83 - 64))) ^ ((s33 << 96 - 87) | (s32 >>> 87 - 64));
t3 ^= (((s34 << 128 - 109) | (s33 >>> 109 - 96)) & ((s34 << 128 - 110) | (s33 >>> 110 - 96))) ^ ((s13 << 96 - 69) | (s12 >>> 69 - 64));

s13 = s12;
s12 = s11;
s11 = t3;
s23 = s22;
s22 = s21;
s21 = t1;
s34 = s33;
s33 = s32;
s32 = s31;
s31 = t2;
}

// NOTE: could save some code memory by merging the two blocks, but that
// would decrease the speed because of additional conditional jumps...
outEnd = outOfs + (len & 3);
//if (0 < outEnd)
if (outOfs < outEnd) // Peli: Apr 3, 2009: BUGFIX
{
int t1, t2, t3, reg;
t1 = ((s13 << 96-66) | (s12 >>> 66-64)) ^ ((s13 << 96-93 ) | (s12 >>> 93-64));
t2 = ((s23 << 96-69) | (s22 >>> 69-64)) ^ ((s23 << 96-84 ) | (s22 >>> 84-64));
t3 = ((s33 << 96-66) | (s32 >>> 66-64)) ^ ((s34 << 128-111) | (s33 >>> 111-96));
int t1, t2, t3, reg;

t1 = ((s13 << 96 - 66) | (s12 >>> 66 - 64)) ^ ((s13 << 96 - 93) | (s12 >>> 93 - 64));
t2 = ((s23 << 96 - 69) | (s22 >>> 69 - 64)) ^ ((s23 << 96 - 84) | (s22 >>> 84 - 64));
t3 = ((s33 << 96 - 66) | (s32 >>> 66 - 64)) ^ ((s34 << 128 - 111) | (s33 >>> 111 - 96));

reg = t1 ^ t2 ^ t3;
for (;outOfs < outEnd; outOfs++, inOfs++)
{
outbuf[outOfs] = (byte)(inbuf[inOfs] ^ reg);
reg >>= 8;
for (; outOfs < outEnd; outOfs++, inOfs++) {
outbuf[outOfs] = (byte) (inbuf[inOfs] ^ reg);
reg >>= 8;
}

t1 ^= (((s13 << 96-91 ) | (s12 >>> 91-64)) & ((s13 << 96-92 ) | (s12 >>> 92-64))) ^ ((s23 << 96-78) | (s22 >>> 78-64));
t2 ^= (((s23 << 96-82 ) | (s22 >>> 82-64)) & ((s23 << 96-83 ) | (s22 >>> 83-64))) ^ ((s33 << 96-87) | (s32 >>> 87-64));
t3 ^= (((s34 << 128-109) | (s33 >>> 109-96)) & ((s34 << 128-110) | (s33 >>> 110-96))) ^ ((s13 << 96-69) | (s12 >>> 69-64));

s13 = s12; s12 = s11; s11 = t3;
s23 = s22; s22 = s21; s21 = t1;
s34 = s33; s33 = s32; s32 = s31; s31 = t2;
t1 ^= (((s13 << 96 - 91) | (s12 >>> 91 - 64)) & ((s13 << 96 - 92) | (s12 >>> 92 - 64))) ^ ((s23 << 96 - 78) | (s22 >>> 78 - 64));
t2 ^= (((s23 << 96 - 82) | (s22 >>> 82 - 64)) & ((s23 << 96 - 83) | (s22 >>> 83 - 64))) ^ ((s33 << 96 - 87) | (s32 >>> 87 - 64));
t3 ^= (((s34 << 128 - 109) | (s33 >>> 109 - 96)) & ((s34 << 128 - 110) | (s33 >>> 110 - 96))) ^ ((s13 << 96 - 69) | (s12 >>> 69 - 64));

s13 = s12;
s12 = s11;
s11 = t3;
s23 = s22;
s22 = s21;
s21 = t1;
s34 = s33;
s33 = s32;
s32 = s31;
s31 = t2;
}

s[0] = s11;
s[1] = s12;
s[2] = s13;
Expand All @@ -120,43 +125,39 @@ public void process(
s[7] = s32;
s[8] = s33;
s[9] = s34;
}

public void reset() throws ESJException
{
// key is cached already, nothing to do here
}

public void setupKey(
int mode,
byte[] key,
int ofs) throws ESJException
{
System.arraycopy(key, ofs, this.key, 0, this.key.length);
}

public void setupNonce(
byte[] nonce,
int ofs) throws ESJException
{
byte[] key = this.key;
int[] s = this.s;

int s11 = Utils.readInt32LE(key, 0);
int s12 = Utils.readInt32LE(key, 4);
int s13 = ( key[8] & 0x0ff) |
((key[9] << 8) & 0x0ff00);
int s21 = Utils.readInt32LE(nonce, ofs);
int s22 = Utils.readInt32LE(nonce, ofs + 4);
int s23 = ( nonce[ofs + 8] & 0x0ff) |
((nonce[ofs + 9] << 8) & 0x0ff00);
int s31 = 0;
int s32 = 0;
int s33 = 0;
int s34 = 0x07000;


///////////////!!!!!!!!!!!!!!!!!!!!!!!!
}

public void reset() throws ESJException {
// key is cached already, nothing to do here
}

public void setupKey(
int mode,
byte[] key,
int ofs) throws ESJException {
System.arraycopy(key, ofs, this.key, 0, this.key.length);
}

public void setupNonce(
byte[] nonce,
int ofs) throws ESJException {
byte[] key = this.key;
int[] s = this.s;

int s11 = Utils.readInt32LE(key, 0);
int s12 = Utils.readInt32LE(key, 4);
int s13 = (key[8] & 0x0ff) |
((key[9] << 8) & 0x0ff00);
int s21 = Utils.readInt32LE(nonce, ofs);
int s22 = Utils.readInt32LE(nonce, ofs + 4);
int s23 = (nonce[ofs + 8] & 0x0ff) |
((nonce[ofs + 9] << 8) & 0x0ff00);
int s31 = 0;
int s32 = 0;
int s33 = 0;
int s34 = 0x07000;

///////////////!!!!!!!!!!!!!!!!!!!!!!!!
// System.out.printf(
// "s11=%08x\n" +
// "s12=%08x\n" +
Expand All @@ -171,25 +172,30 @@ public void setupNonce(
// s11, s12, s13,
// s21, s22, s23,
// s31, s32, s33, s34);


for (int i = 0; i < 4*9; i++)
{
int t1, t2, t3;

t1 = ((s13 << 96-66) | (s12 >>> 66-64)) ^ ((s13 << 96-93 ) | (s12 >>> 93-64));
t2 = ((s23 << 96-69) | (s22 >>> 69-64)) ^ ((s23 << 96-84 ) | (s22 >>> 84-64));
t3 = ((s33 << 96-66) | (s32 >>> 66-64)) ^ ((s34 << 128-111) | (s33 >>> 111-96));

t1 ^= (((s13 << 96-91 ) | (s12 >>> 91-64)) & ((s13 << 96-92 ) | (s12 >>> 92-64))) ^ ((s23 << 96-78) | (s22 >>> 78-64));
t2 ^= (((s23 << 96-82 ) | (s22 >>> 82-64)) & ((s23 << 96-83 ) | (s22 >>> 83-64))) ^ ((s33 << 96-87) | (s32 >>> 87-64));
t3 ^= (((s34 << 128-109) | (s33 >>> 109-96)) & ((s34 << 128-110) | (s33 >>> 110-96))) ^ ((s13 << 96-69) | (s12 >>> 69-64));

s13 = s12; s12 = s11; s11 = t3;
s23 = s22; s22 = s21; s21 = t1;
s34 = s33; s33 = s32; s32 = s31; s31 = t2;

for (int i = 0; i < 4 * 9; i++) {
int t1, t2, t3;

t1 = ((s13 << 96 - 66) | (s12 >>> 66 - 64)) ^ ((s13 << 96 - 93) | (s12 >>> 93 - 64));
t2 = ((s23 << 96 - 69) | (s22 >>> 69 - 64)) ^ ((s23 << 96 - 84) | (s22 >>> 84 - 64));
t3 = ((s33 << 96 - 66) | (s32 >>> 66 - 64)) ^ ((s34 << 128 - 111) | (s33 >>> 111 - 96));

t1 ^= (((s13 << 96 - 91) | (s12 >>> 91 - 64)) & ((s13 << 96 - 92) | (s12 >>> 92 - 64))) ^ ((s23 << 96 - 78) | (s22 >>> 78 - 64));
t2 ^= (((s23 << 96 - 82) | (s22 >>> 82 - 64)) & ((s23 << 96 - 83) | (s22 >>> 83 - 64))) ^ ((s33 << 96 - 87) | (s32 >>> 87 - 64));
t3 ^= (((s34 << 128 - 109) | (s33 >>> 109 - 96)) & ((s34 << 128 - 110) | (s33 >>> 110 - 96))) ^ ((s13 << 96 - 69) | (s12 >>> 69 - 64));

s13 = s12;
s12 = s11;
s11 = t3;
s23 = s22;
s22 = s21;
s21 = t1;
s34 = s33;
s33 = s32;
s32 = s31;
s31 = t2;
}

s[0] = s11;
s[1] = s12;
s[2] = s13;
Expand All @@ -200,25 +206,21 @@ public void setupNonce(
s[7] = s32;
s[8] = s33;
s[9] = s34;
}
}

///////////////////////////////////////////////////////////////////////////

static class Maker implements ICipherMaker
{
public ICipher create() throws ESJException
{

static class Maker implements ICipherMaker {
public ICipher create() throws ESJException {
return new Trivium();
}

public String getName()
{
public String getName() {
return "Trivium";
}
}

public static void register()
{

public static void register() {
Engine.registerCipher(new Maker());
}
}
}
30 changes: 14 additions & 16 deletions Safe/src/estreamj/framework/ESJException.java
View file
@@ -1,23 +1,21 @@

package estreamj.framework;

public class ESJException extends Exception
{
private static final long serialVersionUID = 6375271013846829471L;
public class ESJException extends Exception {
private static final long serialVersionUID = 6375271013846829471L;

public ESJException() {
super();
}
public ESJException() {
super();
}

public ESJException(String message) {
super(message);
}
public ESJException(String message) {
super(message);
}

public ESJException(Throwable cause) {
super(cause);
}
public ESJException(Throwable cause) {
super(cause);
}

public ESJException(String message, Throwable cause) {
super(message, cause);
}
public ESJException(String message, Throwable cause) {
super(message, cause);
}
}

0 comments on commit 2f064ab

Please sign in to comment.