diff options
author | Adam Vartanian <flooey@google.com> | 2017-11-28 11:25:00 +0000 |
---|---|---|
committer | Adam Vartanian <flooey@google.com> | 2017-11-28 15:52:04 +0000 |
commit | 6b5b8b2f1e184da74aa4b2d083cb3f6a3c227844 (patch) | |
tree | 5a98009437bbdb1e906bd00c94c871ffba530783 /bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java | |
parent | 7377028a95a04fd7de0a8b4d821cfb2db7e66f3e (diff) | |
download | bouncycastle-6b5b8b2f1e184da74aa4b2d083cb3f6a3c227844.tar.gz |
Have BC use default provider rather than always BC
In cases where BC algorithms need access to other algorithms, switch to
using the default implementation of JCA algorithms rather than always
using the BC version. Some non-deprecated BC algorithms can access
deprecated BC implementations by using this scheme, and in general we want
to use Conscrypt algorithms when available.
Also comment out a class that isn't ever used.
Bug: 68057944
Test: cts -m CtsLibcoreTestCases
Test: cts -m CtsKeystoreTestCases
Change-Id: Iec4f395b0c6c59865ff6179a4edd3124d2967da9
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java')
-rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java index 5a3af046..b7966ef2 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java @@ -35,14 +35,18 @@ import org.bouncycastle.crypto.params.ParametersWithRandom; import org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi; import org.bouncycastle.jcajce.provider.util.BadBlockException; import org.bouncycastle.jcajce.provider.util.DigestFactory; -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.util.Strings; public class CipherSpi extends BaseCipherSpi { - 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(); private AsymmetricBlockCipher cipher; private AlgorithmParameterSpec paramSpec; |