diff options
| author | Kenny Root <kroot@google.com> | 2014-02-27 10:09:19 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-02-27 10:11:34 -0800 |
| commit | 9e52a4cb3e429adf5b7a48fae96c80bc7088367e (patch) | |
| tree | 41d7f30089044de3342951803e29d41f66be1b29 /patches | |
| parent | 0620ff904e6b109c38a0032f1c1df6bd05f6662f (diff) | |
| download | android_external_bouncycastle-9e52a4cb3e429adf5b7a48fae96c80bc7088367e.tar.gz android_external_bouncycastle-9e52a4cb3e429adf5b7a48fae96c80bc7088367e.tar.bz2 android_external_bouncycastle-9e52a4cb3e429adf5b7a48fae96c80bc7088367e.zip | |
OpenSSLDigest: length to length-offset
doFinal(...) length was being passed in incorrectly.
Bug: 13224655
Change-Id: Ie738446910532a67940fbcd06c5cc961cf7ef9cc
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/bcprov.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/bcprov.patch b/patches/bcprov.patch index 034babf..8ab729f 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -569,7 +569,7 @@ diff -Naur bcprov-jdk15on-150.orig/org/bouncycastle/crypto/digests/AndroidDigest +} diff -Naur bcprov-jdk15on-150.orig/org/bouncycastle/crypto/digests/OpenSSLDigest.java bcprov-jdk15on-150/org/bouncycastle/crypto/digests/OpenSSLDigest.java --- bcprov-jdk15on-150.orig/org/bouncycastle/crypto/digests/OpenSSLDigest.java 1970-01-01 00:00:00.000000000 +0000 -+++ bcprov-jdk15on-150/org/bouncycastle/crypto/digests/OpenSSLDigest.java 2014-02-25 22:51:56.000000000 +0000 ++++ bcprov-jdk15on-150/org/bouncycastle/crypto/digests/OpenSSLDigest.java 2014-02-27 18:09:19.000000000 +0000 @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2008 The Android Open Source Project @@ -638,7 +638,7 @@ diff -Naur bcprov-jdk15on-150.orig/org/bouncycastle/crypto/digests/OpenSSLDigest + + public int doFinal(byte[] out, int outOff) { + try { -+ return delegate.digest(out, outOff, out.length); ++ return delegate.digest(out, outOff, out.length - outOff); + } catch (DigestException e) { + throw new RuntimeException(e); + } |