diff options
| author | Sergio Giro <sgiro@google.com> | 2016-10-13 14:07:05 +0100 |
|---|---|---|
| committer | Sergio Giro <sgiro@google.com> | 2016-10-20 15:20:19 +0000 |
| commit | 64fe4be2b2c98b1231314c785da2c050eccfe99b (patch) | |
| tree | 8ffc9669ccf64a7db706034ead8838c546722292 /bcprov/src/main/java/org/bouncycastle/jce | |
| parent | 48408df5b5da2549208b2a1af26099f80b181f95 (diff) | |
| download | bouncycastle-64fe4be2b2c98b1231314c785da2c050eccfe99b.tar.gz | |
bouncycastle: add support for PKCS5S2 algorithm parameters
Java 8 allows to specify a PBE key using only the password (as opposed
to password + salt + iteration count) and generate the encryption key
later by specifying the rest of the parameters in an AlgorithmParameters
object.
Adding these AlgorithmParameters in BouncyCastle together with support
in ciphers.
Bug: 29631070
Test: run CtsLibcoreTestCases
Change-Id: I0edb36e51374e3e60d8beb10d6178a304f022520
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/jce')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java index 00f23e8d..e5463aa0 100644 --- a/bcprov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java +++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java @@ -59,7 +59,9 @@ public final class BouncyCastleProvider extends Provider private static final String[] SYMMETRIC_GENERIC = { - "PBEPBKDF2", "PBEPKCS12" + // BEGIN android-changed + // Was: "PBEPBKDF2", "PBEPKCS12" + "PBEPBKDF2", "PBEPKCS12", "PBES2AlgorithmParameters" }; private static final String[] SYMMETRIC_MACS = |