| 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/crypto/engines/DESedeWrapEngine.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/crypto/engines/DESedeWrapEngine.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/crypto/engines/DESedeWrapEngine.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/crypto/engines/DESedeWrapEngine.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/crypto/engines/DESedeWrapEngine.java
|