diff options
| author | Kenny Root <kroot@google.com> | 2014-03-11 18:16:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:16:30 +0000 |
| commit | 66d29e6835f7314d0f071452244a9b215633fcad (patch) | |
| tree | 41d7f30089044de3342951803e29d41f66be1b29 | |
| parent | c9ad0e796e1fe521b569798b818ddda3c0ad53e4 (diff) | |
| parent | b0bd6578c030086b816f3ace7b37ee21ca5a25a3 (diff) | |
| download | android_external_bouncycastle-66d29e6835f7314d0f071452244a9b215633fcad.tar.gz android_external_bouncycastle-66d29e6835f7314d0f071452244a9b215633fcad.tar.bz2 android_external_bouncycastle-66d29e6835f7314d0f071452244a9b215633fcad.zip | |
am b0bd6578: Merge "OpenSSLDigest: length to length-offset"
* commit 'b0bd6578c030086b816f3ace7b37ee21ca5a25a3':
OpenSSLDigest: length to length-offset
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java | 2 | ||||
| -rw-r--r-- | patches/bcprov.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java index 5aa1eec..5a87f2a 100644 --- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java +++ b/bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java @@ -65,7 +65,7 @@ public class OpenSSLDigest implements ExtendedDigest { 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); } 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); + } |