diff options
| author | Adam Vartanian <flooey@google.com> | 2017-10-02 14:56:17 +0100 |
|---|---|---|
| committer | Adam Vartanian <flooey@google.com> | 2017-10-03 09:07:14 +0100 |
| commit | 7147cb9bc49d526d69a76fcb1ec15d55ee2f3419 (patch) | |
| tree | 29cced90fe3773b329b58b5d8031f0b53b29051a /bcprov/src/main/java/org/bouncycastle | |
| parent | 410db1cb56f59fbef788f0236dac582f80f91e1a (diff) | |
| download | bouncycastle-7147cb9bc49d526d69a76fcb1ec15d55ee2f3419.tar.gz | |
Add notes detailing algorithm usage.
We intended to remove some lingering ciphers that weren't particularly useful,
but it turns out that some KeyStore implementations require them to be
present. Add a note for the enlightenment of future generations.
Test: make bouncycastle
Change-Id: I158bb047ce5253e468afad2bfcea6b38b333dc35
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java | 2 | ||||
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java index cd28eab3..06693a25 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java @@ -493,6 +493,8 @@ public final class RC2 */ // END Android-removed: Unsupported algorithms + // Android-note: All of the non-disabled algorithms in this class are necessary + // for KeyStore.PKCS12 provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHMD5ANDRC2-CBC", "PBEWITHMD5ANDRC2"); provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHSHA1ANDRC2-CBC", "PBEWITHSHA1ANDRC2"); diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java index 669be26a..62988e01 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java @@ -134,6 +134,7 @@ public final class Twofish // provider.addAlgorithm("AlgorithmParameters.Twofish", PREFIX + "$AlgParams"); // END Android-removed: Unsupported algorithms + // Android-note: These algorithms are necessary for KeyStore.BouncyCastle provider.addAlgorithm("Alg.Alias.AlgorithmParameters.PBEWITHSHAANDTWOFISH", "PKCS12PBE"); provider.addAlgorithm("Alg.Alias.AlgorithmParameters.PBEWITHSHAANDTWOFISH-CBC", "PKCS12PBE"); provider.addAlgorithm("Cipher.PBEWITHSHAANDTWOFISH-CBC", PREFIX + "$PBEWithSHA"); |