commit 6318d7cda5295507d39ae7bd9b90702ccae04a2f
author Geremy Condra <gcondra@google.com> Tue Jan 15 17:38:43 2013 -0800
committer Brian Carlstrom <bdc@google.com> Wed Mar 26 22:52:08 2014 -0700
tree de6553a567069ba228ea05742a91bad9b41f54eb
parent 806ca813c0327a5d673914883853f55440b39cc7

Add certs to blacklist.

(cherry picked from commit 28d59918b7b65a0816ab3f3c3a0746cd1a4b8239)

Change-Id: Ic13d24bcf7b6e0d59ef42f20117a6c7e8e3fa5ad

patches/android.patch

diff --git a/patches/android.patch b/patches/android.patch
index 40a24f8..7d8f673 100644
--- a/patches/android.patch
+++ b/patches/android.patch
@@ -2445,8 +2445,8 @@
      {
 diff -Naur bcprov-jdk16-146.orig/org/bouncycastle/jce/provider/CertBlacklist.java bcprov-jdk16-146/org/bouncycastle/jce/provider/CertBlacklist.java
 --- bcprov-jdk16-146.orig/org/bouncycastle/jce/provider/CertBlacklist.java	1970-01-01 00:00:00.000000000 +0000
-+++ bcprov-jdk16-146/org/bouncycastle/jce/provider/CertBlacklist.java	2012-07-27 18:48:00.031478939 +0000
-@@ -0,0 +1,177 @@
++++ bcprov-jdk16-146/org/bouncycastle/jce/provider/CertBlacklist.java	2014-03-26 19:58:16.596356665 +0000
+@@ -0,0 +1,185 @@
 +/*
 + * Copyright (C) 2012 The Android Open Source Project
 + *
@@ -2545,7 +2545,9 @@
 +            new BigInteger("d7558fdaf5f1105bb213282b707729a3", 16),
 +            new BigInteger("f5c86af36162f13a64f54f6dc9587c06", 16),
 +            new BigInteger("392a434f0e07df1f8aa305de34e0c229", 16),
-+            new BigInteger("3e75ced46b693021218830ae86a82a71", 16)
++            new BigInteger("3e75ced46b693021218830ae86a82a71", 16),
++            new BigInteger("864", 16),
++            new BigInteger("827", 16)
 +        ));
 +
 +        // attempt to augment it with values taken from gservices
@@ -2586,7 +2588,13 @@
 +            // From http://src.chromium.org/viewvc/chrome?view=rev&revision=108479
 +            // Subject: O=Digicert Sdn. Bhd.
 +            // Issuer: CN=GTE CyberTrust Global Root
-+            "0129bcd5b448ae8d2496d1c3e19723919088e152".getBytes()
++            "0129bcd5b448ae8d2496d1c3e19723919088e152".getBytes(),
++            // Subject: CN=e-islem.kktcmerkezbankasi.org/emailAddress=ileti@kktcmerkezbankasi.org
++            // Issuer: CN=T\xC3\x9CRKTRUST Elektronik Sunucu Sertifikas\xC4\xB1 Hizmetleri
++            "5f3ab33d55007054bc5e3e5553cd8d8465d77c61".getBytes(),
++            // Subject: CN=*.EGO.GOV.TR 93
++            // Issuer: CN=T\xC3\x9CRKTRUST Elektronik Sunucu Sertifikas\xC4\xB1 Hizmetleri
++            "783333c9687df63377efceddd82efa9101913e8e".getBytes()
 +        ));
 +
 +        // attempt to augment it with values taken from gservices

src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java

diff --git a/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java b/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java
index 1dea522..2d4f74e 100644
--- a/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java
+++ b/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java
@@ -96,7 +96,9 @@
             new BigInteger("d7558fdaf5f1105bb213282b707729a3", 16),
             new BigInteger("f5c86af36162f13a64f54f6dc9587c06", 16),
             new BigInteger("392a434f0e07df1f8aa305de34e0c229", 16),
-            new BigInteger("3e75ced46b693021218830ae86a82a71", 16)
+            new BigInteger("3e75ced46b693021218830ae86a82a71", 16),
+            new BigInteger("864", 16),
+            new BigInteger("827", 16)
         ));
 
         // attempt to augment it with values taken from gservices
@@ -137,7 +139,13 @@
             // From http://src.chromium.org/viewvc/chrome?view=rev&revision=108479
             // Subject: O=Digicert Sdn. Bhd.
             // Issuer: CN=GTE CyberTrust Global Root
-            "0129bcd5b448ae8d2496d1c3e19723919088e152".getBytes()
+            "0129bcd5b448ae8d2496d1c3e19723919088e152".getBytes(),
+            // Subject: CN=e-islem.kktcmerkezbankasi.org/emailAddress=ileti@kktcmerkezbankasi.org
+            // Issuer: CN=T\xC3\x9CRKTRUST Elektronik Sunucu Sertifikas\xC4\xB1 Hizmetleri
+            "5f3ab33d55007054bc5e3e5553cd8d8465d77c61".getBytes(),
+            // Subject: CN=*.EGO.GOV.TR 93
+            // Issuer: CN=T\xC3\x9CRKTRUST Elektronik Sunucu Sertifikas\xC4\xB1 Hizmetleri
+            "783333c9687df63377efceddd82efa9101913e8e".getBytes()
         ));
 
         // attempt to augment it with values taken from gservices