diff options
| author | Sergio Giro <sgiro@google.com> | 2017-01-19 21:40:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-19 21:40:17 +0000 |
| commit | fbf7512c8942075f80cba53e708c13682f04ea29 (patch) | |
| tree | 8ebc72ead6f9a80938fdba92e217da96ee451037 /bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java | |
| parent | e54ca62fe13a7f6a52a89e409edcf4b6547072be (diff) | |
| parent | 07a37e800ceaa1470036078af8d69981604e0945 (diff) | |
| download | bouncycastle-fbf7512c8942075f80cba53e708c13682f04ea29.tar.gz | |
Merge "bouncycastle: upgrade to version 1.56" am: ae9dc88d85 am: ed012da722
am: 07a37e800c
Change-Id: Ie6a51b57d83037f0f7f1acecedc16da1c1bd6820
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java index 79ec0f24..e6ec53a0 100644 --- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java +++ b/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java @@ -5,9 +5,11 @@ import org.bouncycastle.crypto.Digest; import org.bouncycastle.crypto.PBEParametersGenerator; // BEGIN android-changed import org.bouncycastle.crypto.digests.AndroidDigestFactory; -// END android-changed import org.bouncycastle.crypto.params.KeyParameter; import org.bouncycastle.crypto.params.ParametersWithIV; +// BEGIN android-removed +// import org.bouncycastle.crypto.util.DigestFactory; +// END android-removed /** * Generator for PBE derived keys and ivs as usd by OpenSSL. |