| 4936950820c68699a4ace55a2a8e5f7f677a913d |
|
11-Jul-2017 |
Adam Vartanian <flooey@google.com> |
Update change markers in external/bouncycastle.
For the most part, this is just changing markers that had no explanatory
text and adding an explanation. Some more detail on two of the common
explanations:
"Unsupported algorithms": We choose not to ship a whole lot of the
various crypto algorithms that Bouncy Castle supports. Justfying each
individual choice to disable a given algorithm is out of place in the
code and also doesn't have a natural home (since each algorithm is
disabled in upwards of a dozen places), so just mark where algorithms
are disabled due to being unsupported.
"Unknown reason": I looked in the history and couldn't find any
justification for the change. Generally these changes were made in
commits with descriptions like "bouncycastle 1.49 upgrade" from multiple
years ago. I don't want to change behavior in this change, so I left
these changes as they were; these can be revisited in the future if
desired.
This change also reverts some diffs from upstream, both inside disabled
blocks of code (which is irrelevant) and ones that are active but have
no behavioral change (for example, an added package-visible constructor
that isn't called by any class in the package). There're also a number
of whitespace-only changes that revert diffs from upstream.
Bug: 63092064
Test: cts -m CtsLibcoreTestCases
Change-Id: I27c61063eda849455bc93edaf180acefb5eed217
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
|
| 7dad97b63c47edea4e3afb374dcd00c7b7a1bdd4 |
|
04-Jan-2017 |
Sergio Giro <sgiro@google.com> |
bouncycastle: upgrade to version 1.56
Merge remote-tracking branch 'aosp/upstream-master' into merge-to-156
Test: ran the following cts modules: CtsLibcoreFileIOTestCases CtsLibcoreJavaUtilCollectionsTestCases CtsLibcoreJsr166TestCases CtsLibcoreLegacy22TestCases CtsLibcoreOjTestCases CtsLibcoreOkHttpTestCases CtsLibcoreTestCases
Bug: 31076342
Change-Id: Iceb926dc5a312b2047bf19d1c82fb16e42bc1461
|
| 4caba4cfca3316673ae4e330e8a47932bed8a53a |
|
28-Dec-2016 |
Sergio Giro <sgiro@google.com> |
bouncycastle: Android tree with upstream code for version 1.56
Test: no tests needed, this branch is for easy diffing against upstream
Change-Id: Ib75613e1211e7f02f225b9020ba31f2b45acc8d8
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
|
| 64fe4be2b2c98b1231314c785da2c050eccfe99b |
|
13-Oct-2016 |
Sergio Giro <sgiro@google.com> |
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
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
|
| 5c39dfb0425106172f6ee6d5f38083d3ec2f266d |
|
05-Oct-2016 |
Sergio Giro <sgiro@google.com> |
external/bouncycastle: add algorithms for PbeWithHmacSha mac variants
Bug: 29631070
Test: run CtsLibcoreTestCases
Change-Id: I5fd344c1de7c687585bc65a582e468501ee9154d
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
|
| 4a2d5c40ffefaaa02c656a091f33fecdf8592607 |
|
05-Feb-2016 |
Sergio Giro <sgiro@google.com> |
bouncycastle: upgrade to version 1.54
Merge remote-tracking branch 'aosp/upstream-master'
Change-Id: I013a531855191a4fb041f7def092704d48188bc4
|
| bdb7b3d37025690a0434040b4e0d0623d9fa74af |
|
02-Feb-2016 |
Sergio Giro <sgiro@google.com> |
bouncycastle: Android tree with upstream code for version 1.54
Change-Id: I3958e32dd005cfb37985a6f13e2464a872290658
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
|
| c1040cb5656c3299f1c2d0fe0bd7c44b10466aaf |
|
01-Feb-2016 |
Sergio Giro <sgiro@google.com> |
Restoring the contents of aosp after
https://android-review.git.corp.google.com/#/c/199871
git diff 9b30eb05e5be69d51881a0d1b31e503e97acd784
(ToT before submitting the patch above)
doesn't show any differences
Change-Id: I9f424a67094839f1893a23cd46ec7d6f0992ac26
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
|
| 80261dd2d1824bb3862e90e77a5412d56ad88b1f |
|
27-Jan-2016 |
Sergio Giro <sgiro@google.com> |
bouncycastle: Android tree with upstream code for version 1.50
Android tree as of c0d8909a6c6a4ac075a9dee7ac1fe6baff34acc0
Change-Id: I8d381554d6edec32aae8ff5bab5d5314f0954440
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
|
| 16f9ee464b68937f45d009d9c1b0eb9b544a8dee |
|
11-Dec-2015 |
Sergio Giro <sgiro@google.com> |
bouncycastle: Android tree with upstream code for version 1.49
Android tree as of 08e455bd61ddaa02255383e85480b0d9cde6e954
Change-Id: I99dab80b49707f0fdefb67ccd1bcfe765363b5e5
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
|