diff options
| author | Jack He <siyuanh@google.com> | 2020-05-05 00:16:03 +0000 |
|---|---|---|
| committer | Jack He <siyuanh@google.com> | 2020-05-05 00:16:03 +0000 |
| commit | a2794f8f23d45aac2abab9de23d5d471db9409c5 (patch) | |
| tree | 9780336e15a3586ec11cd62823fac10d2759bcd3 /bcprov/src/main/java/org/bouncycastle/jcajce/provider | |
| parent | 8974255bb101d5170d60cfe5f4ed4bb5b100337d (diff) | |
| download | bouncycastle-a2794f8f23d45aac2abab9de23d5d471db9409c5.tar.gz | |
Revert "Load default KeyFactory instead of BC's implementation"
Revert submission 1299358-remove_bc_algos
Reason for revert: broke higkey-userdebug
Bug: 155693016
Reverted Changes:
I98adb4d2f:Load default KeyFactory instead of BC's implementa...
I5256fe1c7:Remove deprecated BouncyCastle algorithms
I0437de742:Remove deprecated BouncyCastle algorithms
Ie9e0cfa02:Remove deprecated BouncyCastle algorithms
Change-Id: I477e84bd3009bfdcbc7207e744f590295dbda64b
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/jcajce/provider')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java index 6a52aef2..e0e5d021 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java @@ -406,8 +406,7 @@ public final class DESede */ // END Android-removed: Unsupported algorithms - // Android-removed Bouncy Castle's SHA-1 implementation is removed but we still need PBEWithSHAAnd3-KeyTripleDES-CBC - // if (provider.hasAlgorithm("MessageDigest", "SHA-1")) + if (provider.hasAlgorithm("MessageDigest", "SHA-1")) { provider.addAlgorithm("Cipher.PBEWITHSHAAND3-KEYTRIPLEDES-CBC", PREFIX + "$PBEWithSHAAndDES3Key"); // BEGIN Android-removed: Unsupported algorithms |