diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-02-01 22:44:03 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-02-01 22:44:03 -0800 |
| commit | 2d8d9ce072842c1c67e912686fd20795c43f221d (patch) | |
| tree | 6dadcd3e3e10fcce1625f200aed8e8e19e27a219 /bcprov/src/main/java/org/bouncycastle/jce | |
| parent | b8bddcfe1c0fdb5fd26a0285673f7d4d488dbab7 (diff) | |
| parent | e0c8f22188026985f304bc28da6fb41d3bffb517 (diff) | |
| download | bouncycastle-2d8d9ce072842c1c67e912686fd20795c43f221d.tar.gz | |
resolved conflicts for merge of e0c8f221 to jb-mr1-dev-plus-aosp
Change-Id: I9988ca591a8632df0f67008a79942c8a8e4174ba
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/jce')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java | 12 |
1 files changed, 10 insertions, 2 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 fee3ea8e..6cc89274 100644 --- a/bcprov/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java +++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java @@ -135,7 +135,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 @@ -176,7 +178,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 |