summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorGeremy Condra <gcondra@google.com>2013-12-10 13:31:49 -0800
committerGeremy Condra <gcondra@google.com>2013-12-10 15:10:29 -0800
commit6f40a55cc851f2fc004a91fca67d183347a92b97 (patch)
tree2e8d55ad8023df555c1c52988c457dc59584c7ab /patches
parentd1606eea212014bfc0c7c1ed4d88631013aa1773 (diff)
downloadandroid_external_bouncycastle-6f40a55cc851f2fc004a91fca67d183347a92b97.tar.gz
android_external_bouncycastle-6f40a55cc851f2fc004a91fca67d183347a92b97.tar.bz2
android_external_bouncycastle-6f40a55cc851f2fc004a91fca67d183347a92b97.zip
Add ANSSI intermediate to the on-device blacklist.
Change-Id: I0ab409f39d0ca5712c75bd5b2ffed041bba3521d
Diffstat (limited to 'patches')
-rw-r--r--patches/bcprov.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/patches/bcprov.patch b/patches/bcprov.patch
index ce5fedf..4199e8f 100644
--- a/patches/bcprov.patch
+++ b/patches/bcprov.patch
@@ -6552,8 +6552,8 @@ diff -Naur bcprov-jdk15on-149.orig/org/bouncycastle/jce/provider/BouncyCastlePro
private void loadAlgorithms(String packageName, String[] names)
diff -Naur bcprov-jdk15on-149.orig/org/bouncycastle/jce/provider/CertBlacklist.java bcprov-jdk15on-149/org/bouncycastle/jce/provider/CertBlacklist.java
--- bcprov-jdk15on-149.orig/org/bouncycastle/jce/provider/CertBlacklist.java 1970-01-01 00:00:00.000000000 +0000
-+++ bcprov-jdk15on-149/org/bouncycastle/jce/provider/CertBlacklist.java 2013-01-16 01:38:43.000000000 +0000
-@@ -0,0 +1,224 @@
++++ bcprov-jdk15on-149/org/bouncycastle/jce/provider/CertBlacklist.java 2013-12-10 21:31:49.000000000 +0000
+@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
@@ -6693,7 +6693,8 @@ diff -Naur bcprov-jdk15on-149.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
@@ -6740,7 +6741,10 @@ diff -Naur bcprov-jdk15on-149.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