Skip to content

Commit be58b03

Browse files
garydgregorygarydgregory
committed
Format tweaks
Longer lines
1 parent 2490376 commit be58b03

3 files changed

Lines changed: 77 additions & 85 deletions

File tree

‎src/main/java/org/apache/commons/codec/digest/Blake3.java‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
public final class Blake3 {
7777

7878
private static final class ChunkState {
79+
7980
private int[] chainingValue;
8081
private final long chunkCounter;
8182
private final int flags;
@@ -209,20 +210,20 @@ private void reset() {
209210
state = new ChunkState(key, 0, flags);
210211
}
211212
}
213+
212214
/**
213215
* Represents the state just prior to either producing an eight word chaining value or any number of output bytes
214216
* when the ROOT flag is set.
215217
*/
216218
private static final class Output {
219+
217220
private final int[] inputChainingValue;
218221
private final int[] blockWords;
219222
private final long counter;
220223
private final int blockLength;
221224
private final int flags;
222225

223-
private Output(
224-
final int[] inputChainingValue, final int[] blockWords, final long counter, final int blockLength,
225-
final int flags) {
226+
private Output(final int[] inputChainingValue, final int[] blockWords, final long counter, final int blockLength, final int flags) {
226227
this.inputChainingValue = inputChainingValue;
227228
this.blockWords = blockWords;
228229
this.counter = counter;
@@ -231,17 +232,15 @@ private Output(
231232
}
232233

233234
private int[] chainingValue() {
234-
return Arrays
235-
.copyOf(compress(inputChainingValue, blockWords, blockLength, counter, flags), CHAINING_VALUE_INTS);
235+
return Arrays.copyOf(compress(inputChainingValue, blockWords, blockLength, counter, flags), CHAINING_VALUE_INTS);
236236
}
237237

238238
private void rootOutputBytes(final byte[] out, int offset, int length) {
239239
int outputBlockCounter = 0;
240240
while (length > 0) {
241241
int chunkLength = Math.min(OUT_LEN * 2, length);
242242
length -= chunkLength;
243-
final int[] words =
244-
compress(inputChainingValue, blockWords, blockLength, outputBlockCounter++, flags | ROOT);
243+
final int[] words = compress(inputChainingValue, blockWords, blockLength, outputBlockCounter++, flags | ROOT);
245244
int wordCounter = 0;
246245
while (chunkLength > 0) {
247246
final int wordLength = Math.min(Integer.BYTES, chunkLength);
@@ -252,35 +251,33 @@ private void rootOutputBytes(final byte[] out, int offset, int length) {
252251
}
253252
}
254253
}
254+
255255
private static final int BLOCK_LEN = 64;
256256
private static final int BLOCK_INTS = BLOCK_LEN / Integer.BYTES;
257257
private static final int KEY_LEN = 32;
258258
private static final int KEY_INTS = KEY_LEN / Integer.BYTES;
259-
260259
private static final int OUT_LEN = 32;
261-
262260
private static final int CHUNK_LEN = 1024;
263261
private static final int CHAINING_VALUE_INTS = 8;
262+
264263
/**
265264
* Standard hash key used for plain hashes; same initialization vector as Blake2s.
266265
*/
267-
private static final int[] IV =
268-
{ 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19 };
266+
private static final int[] IV = { 0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19 };
267+
269268
// domain flags
270269
private static final int CHUNK_START = 1;
271270
private static final int CHUNK_END = 1 << 1;
272271
private static final int PARENT = 1 << 2;
273272
private static final int ROOT = 1 << 3;
274-
275273
private static final int KEYED_HASH = 1 << 4;
276-
277274
private static final int DERIVE_KEY_CONTEXT = 1 << 5;
278-
279275
private static final int DERIVE_KEY_MATERIAL = 1 << 6;
280276

281277
/**
282278
* Pre-permuted for all 7 rounds; the second row (2,6,3,...) indicates the base permutation.
283279
*/
280+
// @formatter:off
284281
private static final byte[][] MSG_SCHEDULE = {
285282
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
286283
{ 2, 6, 3, 10, 7, 0, 4, 13, 1, 11, 12, 5, 9, 14, 15, 8 },
@@ -290,6 +287,7 @@ private void rootOutputBytes(final byte[] out, int offset, int length) {
290287
{ 9, 14, 11, 5, 8, 12, 15, 1, 13, 3, 0, 10, 2, 6, 4, 7 },
291288
{ 11, 15, 5, 0, 1, 9, 8, 6, 14, 10, 2, 12, 3, 4, 7, 13 }
292289
};
290+
// @formatter:on
293291

294292
private static void checkBufferArgs(final byte[] buffer, final int offset, final int length) {
295293
Objects.requireNonNull(buffer);
@@ -301,14 +299,11 @@ private static void checkBufferArgs(final byte[] buffer, final int offset, final
301299
}
302300
final int bufferLength = buffer.length;
303301
if (offset > bufferLength - length) {
304-
throw new IndexOutOfBoundsException(
305-
"Offset " + offset + " and length " + length + " out of bounds with buffer length " + bufferLength);
302+
throw new IndexOutOfBoundsException("Offset " + offset + " and length " + length + " out of bounds with buffer length " + bufferLength);
306303
}
307304
}
308305

309-
private static int[] compress(
310-
final int[] chainingValue, final int[] blockWords, final int blockLength, final long counter,
311-
final int flags) {
306+
private static int[] compress(final int[] chainingValue, final int[] blockWords, final int blockLength, final long counter, final int flags) {
312307
final int[] state = Arrays.copyOf(chainingValue, BLOCK_INTS);
313308
System.arraycopy(IV, 0, state, 8, 4);
314309
state[12] = (int) counter;
@@ -329,8 +324,7 @@ private static int[] compress(
329324
/**
330325
* The mixing function, G, which mixes either a column or a diagonal.
331326
*/
332-
private static void g(
333-
final int[] state, final int a, final int b, final int c, final int d, final int mx, final int my) {
327+
private static void g(final int[] state, final int a, final int b, final int c, final int d, final int mx, final int my) {
334328
state[a] += state[b] + mx;
335329
state[d] = Integer.rotateRight(state[d] ^ state[a], 16);
336330
state[c] += state[d];
@@ -414,13 +408,11 @@ private static void packInt(final int value, final byte[] dst, final int off, fi
414408
}
415409
}
416410

417-
private static int[] parentChainingValue(
418-
final int[] leftChildCV, final int[] rightChildCV, final int[] key, final int flags) {
411+
private static int[] parentChainingValue(final int[] leftChildCV, final int[] rightChildCV, final int[] key, final int flags) {
419412
return parentOutput(leftChildCV, rightChildCV, key, flags).chainingValue();
420413
}
421414

422-
private static Output parentOutput(
423-
final int[] leftChildCV, final int[] rightChildCV, final int[] key, final int flags) {
415+
private static Output parentOutput(final int[] leftChildCV, final int[] rightChildCV, final int[] key, final int flags) {
424416
final int[] blockWords = Arrays.copyOf(leftChildCV, BLOCK_INTS);
425417
System.arraycopy(rightChildCV, 0, blockWords, 8, CHAINING_VALUE_INTS);
426418
return new Output(key.clone(), blockWords, 0, BLOCK_LEN, flags | PARENT);

‎src/main/java/org/apache/commons/codec/digest/HmacUtils.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,9 @@ public static Mac getInitializedMac(final HmacAlgorithms algorithm, final byte[]
196196
* when a {@link NoSuchAlgorithmException} is caught or key is null or key is invalid.
197197
*/
198198
public static Mac getInitializedMac(final String algorithm, final byte[] key) {
199-
200199
if (key == null) {
201200
throw new IllegalArgumentException("Null key");
202201
}
203-
204202
try {
205203
final SecretKeySpec keySpec = new SecretKeySpec(key, algorithm);
206204
final Mac mac = Mac.getInstance(algorithm);

‎src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java‎

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public class PureJavaCrc32 implements Checksum {
4949
* CRC-32 lookup tables generated by the polynomial 0xEDB88320.
5050
* See also TestPureJavaCrc32.Table.
5151
*/
52+
// @formatter:off
5253
private static final int[] T = {
5354
/* T8_0 */
5455
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
@@ -571,74 +572,75 @@ public class PureJavaCrc32 implements Checksum {
571572
0x2C8E0FFF, 0xE0240F61, 0x6EAB0882, 0xA201081C,
572573
0xA8C40105, 0x646E019B, 0xEAE10678, 0x264B06E6
573574
};
575+
// @formatter:on
574576

575-
/** The current CRC value, bit-flipped */
576-
private int crc;
577+
/** The current CRC value, bit-flipped */
578+
private int crc;
577579

578-
/** Create a new PureJavaCrc32 object. */
579-
public PureJavaCrc32() {
580-
resetCrc();
581-
}
580+
/** Create a new PureJavaCrc32 object. */
581+
public PureJavaCrc32() {
582+
resetCrc();
583+
}
584+
585+
@Override
586+
public long getValue() {
587+
return ~crc & 0xffffffffL;
588+
}
589+
590+
@Override
591+
public void reset() {
592+
resetCrc();
593+
}
582594

583-
@Override
584-
public long getValue() {
585-
return ~crc & 0xffffffffL;
586-
}
595+
// called by ctor, so must not be overrideable
596+
private void resetCrc() {
597+
crc = 0xffffffff;
598+
}
587599

588-
@Override
589-
public void reset() {
590-
resetCrc();
591-
}
600+
@Override
601+
public void update(final byte[] b, final int offset, final int len) {
602+
int localCrc = crc;
592603

593-
// called by ctor, so must not be overrideable
594-
private void resetCrc() {
595-
crc = 0xffffffff;
596-
}
604+
final int remainder = len & 0x7;
605+
int i = offset;
606+
for (final int end = offset + len - remainder; i < end; i += 8) {
607+
final int x = localCrc ^
608+
(b[i] << 24 >>> 24) + (b[i + 1] << 24 >>> 16) +
609+
(b[i + 2] << 24 >>> 8) + (b[i + 3] << 24);
597610

598-
@Override
599-
public void update(final byte[] b, final int offset, final int len) {
600-
int localCrc = crc;
611+
localCrc = T[(x << 24 >>> 24) + 0x700] ^ T[(x << 16 >>> 24) + 0x600] ^
612+
T[(x << 8 >>> 24) + 0x500] ^ T[ (x >>> 24) + 0x400] ^
613+
T[(b[i + 4] << 24 >>> 24) + 0x300] ^ T[(b[i + 5] << 24 >>> 24) + 0x200] ^
614+
T[(b[i + 6] << 24 >>> 24) + 0x100] ^ T[b[i + 7] << 24 >>> 24];
615+
}
601616

602-
final int remainder = len & 0x7;
603-
int i = offset;
604-
for (final int end = offset + len - remainder; i < end; i += 8) {
605-
final int x = localCrc ^
606-
(b[i] << 24 >>> 24) + (b[i + 1] << 24 >>> 16) +
607-
(b[i + 2] << 24 >>> 8) + (b[i + 3] << 24);
617+
/* loop unroll - duff's device style */
618+
switch (remainder) {
619+
case 7:
620+
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
621+
case 6:
622+
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
623+
case 5:
624+
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
625+
case 4:
626+
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
627+
case 3:
628+
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
629+
case 2:
630+
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
631+
case 1:
632+
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
633+
default:
634+
/* nothing */
635+
}
608636

609-
localCrc = T[(x << 24 >>> 24) + 0x700] ^ T[(x << 16 >>> 24) + 0x600] ^
610-
T[(x << 8 >>> 24) + 0x500] ^ T[ (x >>> 24) + 0x400] ^
611-
T[(b[i + 4] << 24 >>> 24) + 0x300] ^ T[(b[i + 5] << 24 >>> 24) + 0x200] ^
612-
T[(b[i + 6] << 24 >>> 24) + 0x100] ^ T[b[i + 7] << 24 >>> 24];
637+
// Publish crc out to object
638+
crc = localCrc;
613639
}
614640

615-
/* loop unroll - duff's device style */
616-
switch (remainder) {
617-
case 7:
618-
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
619-
case 6:
620-
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
621-
case 5:
622-
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
623-
case 4:
624-
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
625-
case 3:
626-
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
627-
case 2:
628-
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
629-
case 1:
630-
localCrc = localCrc >>> 8 ^ T[(localCrc ^ b[i++]) << 24 >>> 24];
631-
default:
632-
/* nothing */
641+
@Override
642+
final public void update(final int b) {
643+
crc = crc >>> 8 ^ T[(crc ^ b) << 24 >>> 24];
633644
}
634645

635-
// Publish crc out to object
636-
crc = localCrc;
637-
}
638-
639-
@Override
640-
final public void update(final int b) {
641-
crc = crc >>> 8 ^ T[(crc ^ b) << 24 >>> 24];
642-
}
643-
644646
}

0 commit comments

Comments
 (0)