Skip to content

Commit

Permalink
Lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@jedisct1
jedisct1 committed Mar 14, 2024
1 parent 9999aa9 commit 50749d3
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 37 deletions.
36 changes: 18 additions & 18 deletions src/main/java/com/github/cfrg/aegis/Aegis128L.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ public static byte[] keygen() {
* @return the generated key as a byte array
*/
public static byte[] noncegen() {
var key = new byte[16];
var nonce = new byte[16];
var rng = new SecureRandom();
rng.nextBytes(key);
return key;
rng.nextBytes(nonce);
return nonce;
}

AesBlock state[] = new AesBlock[8];
AesBlock[] state = new AesBlock[8];

int tag_length;

public Aegis128L(final byte key[], final byte nonce[], final int tag_length) throws InvalidParameterException {
public Aegis128L(final byte[] key, final byte[] nonce, final int tag_length) throws InvalidParameterException {
if (tag_length != 16 && tag_length != 32) {
throw new InvalidParameterException("invalid tag length");
}
Expand All @@ -49,9 +49,9 @@ public Aegis128L(final byte key[], final byte nonce[], final int tag_length) thr
}
this.tag_length = tag_length;

final byte c0_bytes[] = { 0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90 - 256,
final byte[] c0_bytes = { 0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90 - 256,
0xe9 - 256, 0x79, 0x62 };
final byte c1_bytes[] = { 0xdb - 256, 0x3d, 0x18, 0x55, 0x6d, 0xc2 - 256, 0x2f, 0xf1 - 256, 0x20, 0x11, 0x31,
final byte[] c1_bytes = { 0xdb - 256, 0x3d, 0x18, 0x55, 0x6d, 0xc2 - 256, 0x2f, 0xf1 - 256, 0x20, 0x11, 0x31,
0x42, 0x73, 0xb5 - 256, 0x28, 0xdd - 256 };
final AesBlock c0 = new AesBlock(c0_bytes);
final AesBlock c1 = new AesBlock(c1_bytes);
Expand Down Expand Up @@ -80,7 +80,7 @@ public Aegis128L(final byte key[], final byte nonce[], final int tag_length) thr
* @param ad the associated data
* @return the authenticated ciphertext and a detached tag
*/
public AuthenticatedCiphertext encryptDetached(final byte msg[], final byte ad[]) {
public AuthenticatedCiphertext encryptDetached(final byte[] msg, final byte[] ad) {
var ciphertext = new byte[msg.length];
var i = 0;
if (ad != null) {
Expand Down Expand Up @@ -116,7 +116,7 @@ public AuthenticatedCiphertext encryptDetached(final byte msg[], final byte ad[]
}
}
}
final var tag = this.finalize(ad == null ? 0 : ad.length, msg == null ? 0 : msg.length);
final var tag = this.mac(ad == null ? 0 : ad.length, msg == null ? 0 : msg.length);

return new AuthenticatedCiphertext(ciphertext, tag);
}
Expand All @@ -128,7 +128,7 @@ public AuthenticatedCiphertext encryptDetached(final byte msg[], final byte ad[]
* @param ad the associated data
* @return the authenticated ciphertext that includes the tag
*/
public byte[] encrypt(final byte msg[], final byte ad[]) {
public byte[] encrypt(final byte[] msg, final byte[] ad) {
var res = this.encryptDetached(msg, ad);
var ciphertext = new byte[res.ct.length + res.tag.length];
for (var i = 0; i < res.ct.length; i++) {
Expand All @@ -148,7 +148,7 @@ public byte[] encrypt(final byte msg[], final byte ad[]) {
* @return the decrypted message
* @throws VerificationFailedException if the tag verification fails
*/
public byte[] decryptDetached(final AuthenticatedCiphertext ac, final byte ad[])
public byte[] decryptDetached(final AuthenticatedCiphertext ac, final byte[] ad)
throws VerificationFailedException {
var i = 0;
if (ad != null) {
Expand Down Expand Up @@ -178,7 +178,7 @@ public byte[] decryptDetached(final AuthenticatedCiphertext ac, final byte ad[])
msg[i + j] = xi[j];
}
}
final var tag = this.finalize(ad == null ? 0 : ad.length, msg == null ? 0 : msg.length);
final var tag = this.mac(ad == null ? 0 : ad.length, msg == null ? 0 : msg.length);
var dt = (byte) 0;
for (var j = 0; j < tag.length; j++) {
dt |= tag[j] ^ ac.tag[j];
Expand All @@ -198,7 +198,7 @@ public byte[] decryptDetached(final AuthenticatedCiphertext ac, final byte ad[])
* @throws VerificationFailedException If the ciphertext is truncated or
* decryption fails.
*/
public byte[] decrypt(final byte ciphertext[], final byte ad[]) throws VerificationFailedException {
public byte[] decrypt(final byte[] ciphertext, final byte[] ad) throws VerificationFailedException {
if (ciphertext.length < this.tag_length) {
throw new VerificationFailedException("truncated ciphertext");
}
Expand Down Expand Up @@ -228,14 +228,14 @@ protected void update(final AesBlock m0, final AesBlock m1) {
s[0] = s[0].xor(m0);
}

protected void absorb(byte ai[]) {
protected void absorb(byte[] ai) {
assert ai.length == 32;
final var t0 = new AesBlock(Arrays.copyOfRange(ai, 0, 16));
final var t1 = new AesBlock(Arrays.copyOfRange(ai, 16, 32));
this.update(t0, t1);
}

protected byte[] enc(byte xi[]) {
protected byte[] enc(byte[] xi) {
assert xi.length == 32;
var s = this.state;
final var z0 = s[6].xor(s[1]).xor(s[2].and(s[3]));
Expand All @@ -255,7 +255,7 @@ protected byte[] enc(byte xi[]) {
return ci;
}

protected byte[] dec(byte ci[]) {
protected byte[] dec(byte[] ci) {
assert ci.length == 32;
var s = this.state;
final var z0 = s[6].xor(s[1]).xor(s[2].and(s[3]));
Expand All @@ -277,7 +277,7 @@ protected byte[] dec(byte ci[]) {
return xi;
}

protected byte[] decLast(byte cn[]) {
protected byte[] decLast(byte[] cn) {
assert cn.length <= 32;
var s = this.state;
final var z0 = s[6].xor(s[1]).xor(s[2].and(s[3]));
Expand Down Expand Up @@ -311,7 +311,7 @@ protected byte[] decLast(byte cn[]) {
return xn;
}

protected byte[] finalize(final int ad_len_bytes, final int msg_len_bytes) {
protected byte[] mac(final int ad_len_bytes, final int msg_len_bytes) {
var s = this.state;
var bytes = new byte[16];

Expand Down
37 changes: 18 additions & 19 deletions src/main/java/com/github/cfrg/aegis/Aegis256.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ public static byte[] keygen() {
* @return the generated nonce as a byte array
*/
public static byte[] noncegen() {
var key = new byte[32];
var nonce = new byte[32];
var rng = new SecureRandom();
rng.nextBytes(key);
return key;
rng.nextBytes(nonce);
return nonce;
}

AesBlock state[] = new AesBlock[6];
AesBlock[] state = new AesBlock[6];

int tag_length;

public Aegis256(final byte key[], final byte nonce[], final int tag_length) throws InvalidParameterException {
public Aegis256(final byte[] key, final byte[] nonce, final int tag_length) throws InvalidParameterException {
if (tag_length != 16 && tag_length != 32) {
throw new InvalidParameterException("invalid tag length");
}
Expand All @@ -49,9 +49,9 @@ public Aegis256(final byte key[], final byte nonce[], final int tag_length) thro
}
this.tag_length = tag_length;

final byte c0_bytes[] = { 0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90 - 256,
final byte[] c0_bytes = { 0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59, 0x90 - 256,
0xe9 - 256, 0x79, 0x62 };
final byte c1_bytes[] = { 0xdb - 256, 0x3d, 0x18, 0x55, 0x6d, 0xc2 - 256, 0x2f, 0xf1 - 256, 0x20, 0x11, 0x31,
final byte[] c1_bytes = { 0xdb - 256, 0x3d, 0x18, 0x55, 0x6d, 0xc2 - 256, 0x2f, 0xf1 - 256, 0x20, 0x11, 0x31,
0x42, 0x73, 0xb5 - 256, 0x28, 0xdd - 256 };
final AesBlock c0 = new AesBlock(c0_bytes);
final AesBlock c1 = new AesBlock(c1_bytes);
Expand All @@ -77,7 +77,7 @@ public Aegis256(final byte key[], final byte nonce[], final int tag_length) thro
}
}

public AuthenticatedCiphertext encryptDetached(final byte msg[], final byte ad[]) {
public AuthenticatedCiphertext encryptDetached(final byte[] msg, final byte[] ad) {
var ciphertext = new byte[msg.length];
var i = 0;
if (ad != null) {
Expand Down Expand Up @@ -113,12 +113,12 @@ public AuthenticatedCiphertext encryptDetached(final byte msg[], final byte ad[]
}
}
}
final var tag = this.finalize(ad == null ? 0 : ad.length, msg == null ? 0 : msg.length);
final var tag = this.mac(ad == null ? 0 : ad.length, msg == null ? 0 : msg.length);

return new AuthenticatedCiphertext(ciphertext, tag);
}

public byte[] encrypt(final byte msg[], final byte ad[]) {
public byte[] encrypt(final byte[] msg, final byte[] ad) {
var res = this.encryptDetached(msg, ad);
var ciphertext = new byte[res.ct.length + res.tag.length];
for (var i = 0; i < res.ct.length; i++) {
Expand All @@ -130,7 +130,7 @@ public byte[] encrypt(final byte msg[], final byte ad[]) {
return ciphertext;
}

public byte[] decryptDetached(final AuthenticatedCiphertext ac, final byte ad[])
public byte[] decryptDetached(final AuthenticatedCiphertext ac, final byte[] ad)
throws VerificationFailedException {
var i = 0;
if (ad != null) {
Expand Down Expand Up @@ -160,7 +160,7 @@ public byte[] decryptDetached(final AuthenticatedCiphertext ac, final byte ad[])
msg[i + j] = xi[j];
}
}
final var tag = this.finalize(ad == null ? 0 : ad.length, msg == null ? 0 : msg.length);
final var tag = this.mac(ad == null ? 0 : ad.length, msg == null ? 0 : msg.length);
var dt = (byte) 0;
for (var j = 0; j < tag.length; j++) {
dt |= tag[j] ^ ac.tag[j];
Expand All @@ -171,7 +171,7 @@ public byte[] decryptDetached(final AuthenticatedCiphertext ac, final byte ad[])
return msg;
}

public byte[] decrypt(final byte ciphertext[], final byte ad[]) throws VerificationFailedException {
public byte[] decrypt(final byte[] ciphertext, final byte[] ad) throws VerificationFailedException {
if (ciphertext.length < this.tag_length) {
throw new VerificationFailedException("truncated ciphertext");
}
Expand All @@ -198,13 +198,13 @@ protected void update(final AesBlock m) {
s[0] = s[0].xor(m);
}

protected void absorb(byte ai[]) {
protected void absorb(byte[] ai) {
assert ai.length == 16;
final var t = new AesBlock(ai);
this.update(t);
}

protected byte[] enc(byte xi[]) {
protected byte[] enc(byte[] xi) {
assert xi.length == 16;
var s = this.state;
final var z = s[1].xor(s[4]).xor(s[5]).xor(s[2].and(s[3]));
Expand All @@ -214,15 +214,14 @@ protected byte[] enc(byte xi[]) {
return ci;
}

protected byte[] dec(byte ci[]) {
protected byte[] dec(byte[] ci) {
assert ci.length == 16;
var s = this.state;
final var z = s[1].xor(s[4]).xor(s[5]).xor(s[2].and(s[3]));
final var t = new AesBlock(ci);
final var out = t.xor(z);
this.update(out);
final var xi = out.toBytes();
return xi;
return out.toBytes();
}

protected byte[] decLast(byte cn[]) {
Expand Down Expand Up @@ -252,7 +251,7 @@ protected byte[] decLast(byte cn[]) {
return xn;
}

protected byte[] finalize(final int ad_len_bytes, final int msg_len_bytes) {
protected byte[] mac(final int ad_len_bytes, final int msg_len_bytes) {
var s = this.state;
var bytes = new byte[16];

Expand Down

0 comments on commit 50749d3

Please sign in to comment.