diff options
| author | Adam Vartanian <flooey@google.com> | 2017-10-12 11:38:47 +0100 |
|---|---|---|
| committer | Adam Vartanian <flooey@google.com> | 2017-10-12 11:42:54 +0100 |
| commit | 4ea357343d40fb7d9e9c3f5f01ae088319dd6924 (patch) | |
| tree | a12b923573e413ecaa5f045161e90a5627f720b2 /bcprov/src/main/java/org/bouncycastle | |
| parent | a7f9095ead5e2af9612c8cae35f6e11a2b8e1d77 (diff) | |
| download | bouncycastle-4ea357343d40fb7d9e9c3f5f01ae088319dd6924.tar.gz | |
Change BKS KeyStore to use default provider for crypto.
The default implementation of the BKS KeyStore always requests the Bouncy
Castle implementation of JCA algorithms, which will fail when those
algorithms are deprecated. Have it use the default provider instead, which
will result in it using Conscrypt versions instead when available.
Bug: 67626877
Test: cts -m CtsLibcoreTestCases
Change-Id: I0e8bef840581169dec210fa804554ac1d46fa65e
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java index 06406698..85365b7d 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java @@ -48,7 +48,9 @@ import org.bouncycastle.crypto.io.DigestOutputStream; import org.bouncycastle.crypto.io.MacInputStream; import org.bouncycastle.crypto.io.MacOutputStream; import org.bouncycastle.crypto.macs.HMac; -import org.bouncycastle.jcajce.util.BCJcaJceHelper; +// Android-changed: Use default provider for JCA algorithms instead of BC +// Was: import org.bouncycastle.jcajce.util.BCJcaJceHelper; +import org.bouncycastle.jcajce.util.DefaultJcaJceHelper; import org.bouncycastle.jcajce.util.JcaJceHelper; import org.bouncycastle.jce.interfaces.BCKeyStore; import org.bouncycastle.jce.provider.BouncyCastleProvider; @@ -92,7 +94,9 @@ public class BcKeyStoreSpi protected int version; - private final JcaJceHelper helper = new BCJcaJceHelper(); + // Android-changed: Use default provider for JCA algorithms instead of BC + // Was: private final JcaJceHelper helper = new BCJcaJceHelper(); + private final JcaJceHelper helper = new DefaultJcaJceHelper(); public BcKeyStoreSpi(int version) { |