diff options
author | Geremy Condra <gcondra@google.com> | 2014-03-27 16:56:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 16:56:04 +0000 |
commit | 676571978db4deb722084054280d1a194600975e (patch) | |
tree | 09df0f9dc85564f4b0fea9b8b494cf0430453357 | |
parent | ac69e78fa4b31aa33cb6182d068a6fd9437aa3f8 (diff) | |
parent | e2408598f09edb15ee496a3854f435ae512e875b (diff) | |
download | android_external_bouncycastle-676571978db4deb722084054280d1a194600975e.tar.gz android_external_bouncycastle-676571978db4deb722084054280d1a194600975e.tar.bz2 android_external_bouncycastle-676571978db4deb722084054280d1a194600975e.zip |
am e2408598: Add ANSSI intermediate to the on-device blacklist.
* commit 'e2408598f09edb15ee496a3854f435ae512e875b':
Add ANSSI intermediate to the on-device blacklist.
-rw-r--r-- | patches/android.patch | 12 | ||||
-rw-r--r-- | src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/patches/android.patch b/patches/android.patch index 7d8f673..492d0e9 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 2014-03-26 19:58:16.596356665 +0000 -@@ -0,0 +1,185 @@ ++++ bcprov-jdk16-146/org/bouncycastle/jce/provider/CertBlacklist.java 2014-03-27 16:31:56.804862297 +0000 +@@ -0,0 +1,189 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * @@ -2547,7 +2547,8 @@ diff -Naur bcprov-jdk16-146.orig/org/bouncycastle/jce/provider/CertBlacklist.jav + 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 @@ -2594,7 +2595,10 @@ diff -Naur bcprov-jdk16-146.orig/org/bouncycastle/jce/provider/CertBlacklist.jav + "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/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java b/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java index 2d4f74e..2a0052f 100644 --- a/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java +++ b/src/main/java/org/bouncycastle/jce/provider/CertBlacklist.java @@ -98,7 +98,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 @@ -145,7 +146,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 |