diff options
author | Adam Vartanian <flooey@google.com> | 2019-07-31 10:40:15 +0100 |
---|---|---|
committer | Adam Vartanian <flooey@google.com> | 2019-07-31 10:40:15 +0100 |
commit | a39e15c4ac3e023172e41c8162996a8e564d6486 (patch) | |
tree | f6a92b66fbbd59792c8537afd0fe424d5d96990a /repackaged/bcprov | |
parent | c65e37c89a98692e518282a6621a1259026f35b8 (diff) | |
download | bouncycastle-a39e15c4ac3e023172e41c8162996a8e564d6486.tar.gz |
Fix srcgen problems in BC
The core-platform-api.txt file contained "Sha1Digest" while the class
was named "SHA1Digest", so it wouldn't actually apply the appropriate
annotations.
Also, two of the resulting files had been manually edited to remove
whitespace. Return them to the autogenerated output to eliminate the
diff.
Test: Run srcgen, manual inspection of results
Change-Id: I64c57775b069720d01da565b245c0d0723686035
Diffstat (limited to 'repackaged/bcprov')
2 files changed, 19 insertions, 19 deletions
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/GeneralDigest.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/GeneralDigest.java index 80714665..690c63dd 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/GeneralDigest.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/GeneralDigest.java @@ -156,7 +156,7 @@ public abstract class GeneralDigest { return BYTE_LENGTH; } - + protected abstract void processWord(byte[] in, int inOff); protected abstract void processLength(long bitLength); diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/SHA1Digest.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/SHA1Digest.java index a101d405..78750ea2 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/SHA1Digest.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/SHA1Digest.java @@ -102,7 +102,7 @@ public class SHA1Digest if (++xOff == 16) { processBlock(); - } + } } protected void processLength( @@ -162,7 +162,7 @@ public class SHA1Digest private static final int Y2 = 0x6ed9eba1; private static final int Y3 = 0x8f1bbcdc; private static final int Y4 = 0xca62c1d6; - + private int f( int u, int v, @@ -211,27 +211,27 @@ public class SHA1Digest // round 1 // int idx = 0; - + for (int j = 0; j < 4; j++) { // E = rotateLeft(A, 5) + f(B, C, D) + E + X[idx++] + Y1 // B = rotateLeft(B, 30) E += (A << 5 | A >>> 27) + f(B, C, D) + X[idx++] + Y1; B = B << 30 | B >>> 2; - + D += (E << 5 | E >>> 27) + f(A, B, C) + X[idx++] + Y1; A = A << 30 | A >>> 2; - + C += (D << 5 | D >>> 27) + f(E, A, B) + X[idx++] + Y1; E = E << 30 | E >>> 2; - + B += (C << 5 | C >>> 27) + f(D, E, A) + X[idx++] + Y1; D = D << 30 | D >>> 2; A += (B << 5 | B >>> 27) + f(C, D, E) + X[idx++] + Y1; C = C << 30 | C >>> 2; } - + // // round 2 // @@ -240,21 +240,21 @@ public class SHA1Digest // E = rotateLeft(A, 5) + h(B, C, D) + E + X[idx++] + Y2 // B = rotateLeft(B, 30) E += (A << 5 | A >>> 27) + h(B, C, D) + X[idx++] + Y2; - B = B << 30 | B >>> 2; - + B = B << 30 | B >>> 2; + D += (E << 5 | E >>> 27) + h(A, B, C) + X[idx++] + Y2; A = A << 30 | A >>> 2; - + C += (D << 5 | D >>> 27) + h(E, A, B) + X[idx++] + Y2; E = E << 30 | E >>> 2; - + B += (C << 5 | C >>> 27) + h(D, E, A) + X[idx++] + Y2; D = D << 30 | D >>> 2; A += (B << 5 | B >>> 27) + h(C, D, E) + X[idx++] + Y2; C = C << 30 | C >>> 2; } - + // // round 3 // @@ -264,13 +264,13 @@ public class SHA1Digest // B = rotateLeft(B, 30) E += (A << 5 | A >>> 27) + g(B, C, D) + X[idx++] + Y3; B = B << 30 | B >>> 2; - + D += (E << 5 | E >>> 27) + g(A, B, C) + X[idx++] + Y3; A = A << 30 | A >>> 2; - + C += (D << 5 | D >>> 27) + g(E, A, B) + X[idx++] + Y3; E = E << 30 | E >>> 2; - + B += (C << 5 | C >>> 27) + g(D, E, A) + X[idx++] + Y3; D = D << 30 | D >>> 2; @@ -287,13 +287,13 @@ public class SHA1Digest // B = rotateLeft(B, 30) E += (A << 5 | A >>> 27) + h(B, C, D) + X[idx++] + Y4; B = B << 30 | B >>> 2; - + D += (E << 5 | E >>> 27) + h(A, B, C) + X[idx++] + Y4; A = A << 30 | A >>> 2; - + C += (D << 5 | D >>> 27) + h(E, A, B) + X[idx++] + Y4; E = E << 30 | E >>> 2; - + B += (C << 5 | C >>> 27) + h(D, E, A) + X[idx++] + Y4; D = D << 30 | D >>> 2; |