diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-03-27 22:11:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 22:11:59 +0000 |
| commit | 78cfdf683821b0464c8d38fe3a96f800cf205022 (patch) | |
| tree | 71b22774adc5ffdafb765a531eeed2935ab4f6c5 | |
| parent | 8926a7f4cdbe241f9baca93b910cb10942ed38be (diff) | |
| parent | 0aec3d0b93686cde6243e524a25df4a517c34c3e (diff) | |
| download | android_external_bouncycastle-78cfdf683821b0464c8d38fe3a96f800cf205022.tar.gz android_external_bouncycastle-78cfdf683821b0464c8d38fe3a96f800cf205022.tar.bz2 android_external_bouncycastle-78cfdf683821b0464c8d38fe3a96f800cf205022.zip | |
am 0aec3d0b: resolved conflicts for merge of f0fb04bc to jb-mr1-dev-plus-aosp
* commit '0aec3d0b93686cde6243e524a25df4a517c34c3e':
Add ANSSI intermediate to the on-device blacklist.
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java | 8 | ||||
| -rw-r--r-- | patches/bcprov.patch | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java index 6cc8927..39ba0ff 100644 --- a/bcprov/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java +++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java @@ -137,7 +137,8 @@ public class CertBlacklist { new BigInteger("392a434f0e07df1f8aa305de34e0c229", 16), new BigInteger("3e75ced46b693021218830ae86a82a71", 16), new BigInteger("864", 16), - new BigInteger("827", 16) + new BigInteger("827", 16), + new BigInteger("31da7", 16) )); // attempt to augment it with values taken from gservices @@ -184,7 +185,10 @@ public class CertBlacklist { "5f3ab33d55007054bc5e3e5553cd8d8465d77c61".getBytes(), // Subject: CN=*.EGO.GOV.TR 93 // Issuer: CN=T\xC3\x9CRKTRUST Elektronik Sunucu Sertifikas\xC4\xB1 Hizmetleri - "783333c9687df63377efceddd82efa9101913e8e".getBytes() + "783333c9687df63377efceddd82efa9101913e8e".getBytes(), + // Subject: Subject: C=FR, O=DG Tr\xC3\xA9sor, CN=AC DG Tr\xC3\xA9sor SSL + // Issuer: C=FR, O=DGTPE, CN=AC DGTPE Signature Authentification + "3ecf4bbbe46096d514bb539bb913d77aa4ef31bf".getBytes() )); // attempt to augment it with values taken from gservices diff --git a/patches/bcprov.patch b/patches/bcprov.patch index 0384dbb..eee76ae 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -6415,8 +6415,8 @@ diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/jce/provider/BouncyCastlePro diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/jce/provider/CertBlacklist.java bcprov-jdk15on-148/org/bouncycastle/jce/provider/CertBlacklist.java --- bcprov-jdk15on-148.orig/org/bouncycastle/jce/provider/CertBlacklist.java 1970-01-01 00:00:00.000000000 +0000 -+++ bcprov-jdk15on-148/org/bouncycastle/jce/provider/CertBlacklist.java 2013-01-16 01:38:43.000000000 +0000 -@@ -0,0 +1,224 @@ ++++ bcprov-jdk15on-148/org/bouncycastle/jce/provider/CertBlacklist.java 2014-03-27 18:35:00.000000000 +0000 +@@ -0,0 +1,228 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * @@ -6556,7 +6556,8 @@ diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/jce/provider/CertBlacklist.j + new BigInteger("392a434f0e07df1f8aa305de34e0c229", 16), + new BigInteger("3e75ced46b693021218830ae86a82a71", 16), + new BigInteger("864", 16), -+ new BigInteger("827", 16) ++ new BigInteger("827", 16), ++ new BigInteger("31da7", 16) + )); + + // attempt to augment it with values taken from gservices @@ -6603,7 +6604,10 @@ diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/jce/provider/CertBlacklist.j + "5f3ab33d55007054bc5e3e5553cd8d8465d77c61".getBytes(), + // Subject: CN=*.EGO.GOV.TR 93 + // Issuer: CN=T\xC3\x9CRKTRUST Elektronik Sunucu Sertifikas\xC4\xB1 Hizmetleri -+ "783333c9687df63377efceddd82efa9101913e8e".getBytes() ++ "783333c9687df63377efceddd82efa9101913e8e".getBytes(), ++ // Subject: Subject: C=FR, O=DG Tr\xC3\xA9sor, CN=AC DG Tr\xC3\xA9sor SSL ++ // Issuer: C=FR, O=DGTPE, CN=AC DGTPE Signature Authentification ++ "3ecf4bbbe46096d514bb539bb913d77aa4ef31bf".getBytes() + )); + + // attempt to augment it with values taken from gservices |