diff options
| author | Geremy Condra <gcondra@google.com> | 2014-03-27 16:25:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 16:25:56 +0000 |
| commit | ac69e78fa4b31aa33cb6182d068a6fd9437aa3f8 (patch) | |
| tree | de6553a567069ba228ea05742a91bad9b41f54eb | |
| parent | f3f6a9ca17b59f4305bf5a99f49b8ece7bf343e6 (diff) | |
| parent | 6318d7cda5295507d39ae7bd9b90702ccae04a2f (diff) | |
| download | android_external_bouncycastle-ac69e78fa4b31aa33cb6182d068a6fd9437aa3f8.tar.gz android_external_bouncycastle-ac69e78fa4b31aa33cb6182d068a6fd9437aa3f8.tar.bz2 android_external_bouncycastle-ac69e78fa4b31aa33cb6182d068a6fd9437aa3f8.zip | |
am 6318d7cd: Add certs to blacklist.
* commit '6318d7cda5295507d39ae7bd9b90702ccae04a2f':
Add certs to blacklist.
| -rw-r--r-- | patches/android.patch | 16 | ||||
| -rw-r--r-- | src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java | 12 |
2 files changed, 22 insertions, 6 deletions
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/BouncyCastleProvi { 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 @@ diff -Naur bcprov-jdk16-146.orig/org/bouncycastle/jce/provider/CertBlacklist.jav + 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 @@ diff -Naur bcprov-jdk16-146.orig/org/bouncycastle/jce/provider/CertBlacklist.jav + // 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 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 @@ public class CertBlacklist { 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 @@ public class CertBlacklist { // 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 |