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/BaseStreamCipher.java
|
3e01c3f6775d3f7364b714d3ced908a901646c43 |
|
27-Jun-2017 |
Adam Vartanian <flooey@google.com> |
external/bouncycastle: Upgrade to version 1.57 Merge remote-tracking branch 'aosp/upstream-master' into merge-157 Notable changes or modifications beyond a simple merge: * Omitted a lot of new code that's unnecessary for us * Commented out new algorithm support, mostly ARIA and GM * Default DSA key size returned to 1024 * Restored org.bouncycastle.asn1.pkcs.Attribute, it was removed previously but modifications to code we use need it This change integrates a change from Bouncy Castle that increases the default key size for DH from 1024 to 2048, which seems like a good idea because 1024-bit keys are at the end of acceptable security at this point. This shouldn't be a problem for apps, because this only affects the default (so anyone who cares can specify a key size) and only affects creating new keys. Test: cts -m CtsLibcoreTestCases Test: cts -m CtsLibcoreFileIOTestCases Test: cts -m CtsLibcoreJsr166TestCases Test: cts -m CtsLibcoreOjTestCases Test: cts -m CtsLibcoreOkHttpTestCases Test: cts -m CtsLibcoreWycheproofBCTestCases Bug: 38331562 Bug: 31801320 Change-Id: I56d1945b565f568c699edc36881e502cab855ddf
|
823ad5bac1616941ae772fe6b69560b49c89d7b3 |
|
26-Jun-2017 |
Adam Vartanian <flooey@google.com> |
bouncycastle: Android tree with upstream code for version 1.57 Test: no tests needed, this branch is only for diffing against upstream Change-Id: I0bfc36b8c07bf4698383ee28ab771907fc1fa7fc
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.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/BaseStreamCipher.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/BaseStreamCipher.java
|
53b61f9fe9d58034fcc7021137e92460f91b70ce |
|
01-Feb-2016 |
Sergio Giro <sgiro@google.com> |
bouncycastle: Android tree with upstream code for version 1.52 Android tree as of 1af9aad12fedf1d93333e19f5ed0ab86f1cc4e2a Change-Id: I714fa0954a5d000cd88d1fb78b0b7fe28246d404
/external/bouncycastle/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.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/BaseStreamCipher.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/BaseStreamCipher.java
|