diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-02-04 11:29:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 11:29:37 -0800 |
| commit | cb59b9889be18464ca3b9a78ea142c3bafdb289f (patch) | |
| tree | 440fe2257ad8a4d11cc68f4fc7152b7dc1e1f8d4 /patches | |
| parent | 8d8898cca6a8e85ab5f3d1a4faa6af55a2912785 (diff) | |
| parent | 2d8d9ce072842c1c67e912686fd20795c43f221d (diff) | |
| download | android_external_bouncycastle-cb59b9889be18464ca3b9a78ea142c3bafdb289f.tar.gz android_external_bouncycastle-cb59b9889be18464ca3b9a78ea142c3bafdb289f.tar.bz2 android_external_bouncycastle-cb59b9889be18464ca3b9a78ea142c3bafdb289f.zip | |
am 2d8d9ce0: resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aosp
# By Geremy Condra
# Via Android Git Automerger (1) and others
* commit '2d8d9ce072842c1c67e912686fd20795c43f221d':
Add certs to blacklist.
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 698151f..ddf87c7 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -7221,7 +7221,7 @@ diff -Naur bcprov-jdk15on-147.orig/org/bouncycastle/jce/provider/CertPathValidat CRLDistPoint crldp, ExtendedPKIXParameters pkixParams) diff -Naur bcprov-jdk15on-147.orig/org/bouncycastle/jce/provider/JCEBlockCipher.java bcprov-jdk15on-147/org/bouncycastle/jce/provider/JCEBlockCipher.java --- bcprov-jdk15on-147.orig/org/bouncycastle/jce/provider/JCEBlockCipher.java 2012-03-22 15:11:48.000000000 +0000 -+++ bcprov-jdk15on-147/org/bouncycastle/jce/provider/JCEBlockCipher.java 2012-09-17 23:04:47.000000000 +0000 ++++ bcprov-jdk15on-147/org/bouncycastle/jce/provider/JCEBlockCipher.java 2013-01-23 01:01:51.954749668 +0000 @@ -18,8 +18,10 @@ import javax.crypto.ShortBufferException; import javax.crypto.spec.IvParameterSpec; @@ -8760,7 +8760,7 @@ diff -Naur bcprov-jdk15on-147.orig/org/bouncycastle/jce/provider/JCESecretKeyFac } diff -Naur bcprov-jdk15on-147.orig/org/bouncycastle/jce/provider/JCEStreamCipher.java bcprov-jdk15on-147/org/bouncycastle/jce/provider/JCEStreamCipher.java --- bcprov-jdk15on-147.orig/org/bouncycastle/jce/provider/JCEStreamCipher.java 2012-03-22 15:11:48.000000000 +0000 -+++ bcprov-jdk15on-147/org/bouncycastle/jce/provider/JCEStreamCipher.java 2012-09-17 23:04:47.000000000 +0000 ++++ bcprov-jdk15on-147/org/bouncycastle/jce/provider/JCEStreamCipher.java 2013-01-23 01:01:51.984750196 +0000 @@ -14,20 +14,26 @@ import javax.crypto.ShortBufferException; import javax.crypto.spec.IvParameterSpec; |