commit 9c08e3452a0ca075e8a6f4818a2127c1ec3cdd7d
author Kenny Root <kroot@google.com> Thu Sep 05 13:55:42 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 05 13:55:42 2013 -0700
tree e3bb1482259cfde0c953f322cf87c975796b78e0
parent e6cfe4d5d488fa66d555bfcf07d8155d684bc8d6
parent 6bee9d2dece0b8a6b3cbd8dcb2bb3c3c04a17f46

am 6bee9d2d: am 0f55bd8a: Merge "Make sure seed values use full range" into jb-dev

* commit '6bee9d2dece0b8a6b3cbd8dcb2bb3c3c04a17f46':
  Make sure seed values use full range

luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java

diff --git a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java
index 2420fbe..4d99d62 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java
@@ -288,6 +288,11 @@
             updateSeed(RandomBitsSupplier.getRandomBits(DIGEST_LENGTH));
             nextBIndex = HASHBYTES_TO_USE;
 
+            // updateSeed(...) updates where the last word of the seed is, so we
+            // have to read it again.
+            lastWord = seed[BYTES_OFFSET] == 0 ? 0
+                    : (seed[BYTES_OFFSET] + extrabytes) >> 3 - 1;
+
         } else if (state == SET_SEED) {
 
             System.arraycopy(seed, HASH_OFFSET, copies, HASHCOPY_OFFSET,