summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-07-02release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release- ↵android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r8android-8.1.0_r7android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1oreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m5-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
4152006 snap-temp-L91700000079405440 Change-Id: I879cf076f5ca1d38b28bce2a0ab17f64cf769fd8
2017-06-29Merge "external/bouncycastle: Upgrade to version 1.57" am: 6ec33a667c am: ↵oreo-mr1-devAdam Vartanian
c34afae882 am: d454d2c786 am: 2449e4138f Change-Id: Ibc64bc7bf40af6fcd9e15ce09e93103300b8129c
2017-06-29Merge "external/bouncycastle: Upgrade to version 1.57" am: 6ec33a667c am: ↵Adam Vartanian
c34afae882 am: d454d2c786 Change-Id: I6a8477543b513ebc1820d7da1c5bc7d8fa4275a3
2017-06-29Merge "external/bouncycastle: Upgrade to version 1.57" am: 6ec33a667cAdam Vartanian
am: c34afae882 Change-Id: Iebe265984f341f88597a55fe6d726ca7c0add8b4
2017-06-29Merge "external/bouncycastle: Upgrade to version 1.57"Adam Vartanian
am: 6ec33a667c Change-Id: I8a95ff4640a41b3ee36e17b48f84a7c35b47c87a
2017-06-29Merge "external/bouncycastle: Upgrade to version 1.57"android-o-preview-4Adam Vartanian
2017-06-28external/bouncycastle: Upgrade to version 1.57Adam Vartanian
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
2017-06-26Merge "bouncycastle: Android tree with upstream code for version 1.57" into ↵Adam Vartanian
upstream-master
2017-06-26bouncycastle: Android tree with upstream code for version 1.57Adam Vartanian
Test: no tests needed, this branch is only for diffing against upstream Change-Id: I0bfc36b8c07bf4698383ee28ab771907fc1fa7fc
2017-06-06release-request-d6bf2db5-83c3-41cb-ba89-644c366c2525-for-git_oc-mr1-release- ↵android-build-team Robot
4070602 snap-temp-L56000000070867102 Change-Id: I45f701dc8df4182142ddc467451f326a01cd5db9
2017-06-06Merge "Add OWNERS in external/bouncycastle" am: 9cea60c7d5 am: e1cfff8e9c ↵oreo-dr1-devChih-Hung Hsieh
am: bccada2809 am: 50e3e4fbae Change-Id: I69d2059a6b5450b89b6e676f32b0f0eefc38693b
2017-06-06Merge "Add OWNERS in external/bouncycastle" am: 9cea60c7d5 am: e1cfff8e9cChih-Hung Hsieh
am: bccada2809 Change-Id: I1c6d6a9e67722ea56e674f5c4ce7b7835f05384b
2017-06-06Merge "Add OWNERS in external/bouncycastle" am: 9cea60c7d5Chih-Hung Hsieh
am: e1cfff8e9c Change-Id: I5cf89f9b4069bbd58ffe754166e45eaac59cf3bd
2017-06-06Merge "Add OWNERS in external/bouncycastle"Chih-Hung Hsieh
am: 9cea60c7d5 Change-Id: Idfe564e7a8c59a01e726b84697b6690d32a10ef4
2017-06-06Merge "Add OWNERS in external/bouncycastle"Treehugger Robot
2017-06-05Add OWNERS in external/bouncycastleChih-Hung Hsieh
Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I9b0a3902e9dc349b7dd582bcb6d93254f76f573a
2017-05-24release-request-e81235f1-b2b4-4de1-b974-255760176f06-for-git_oc-mr1-release- ↵android-build-team Robot
4040405 snap-temp-L68200000067456736 Change-Id: Icbb37f8c094a0528ab1793fce4079bb11002a80a
2017-05-24Don't use algorithm parameters if missing salt or iteration count. am: ↵Adam Vartanian
92e41bf2bd -s ours am: 8bcc319048 -s ours Change-Id: I25143af8beab3d2ae3a9fe47e9f5e76a8f3984b3
2017-05-24Don't use algorithm parameters if missing salt or iteration count.Adam Vartanian
am: 92e41bf2bd -s ours Change-Id: I63c4147dde831b4820829d3a01dd591b672179d2
2017-05-24Don't use algorithm parameters if missing salt or iteration count.android-vts-8.0_r2android-vts-8.0_r1oreo-devAdam Vartanian
The PBEKeySpec constructor doesn't allow an empty salt or iteration count, and throws an exception if it sees one. Bug: 38161557 Test: cts -m CtsLibcoreTestCases (cherry picked from commit 65832e311cb5fda062d79599b149232b47294fea) Change-Id: I69d05471af364f69793e83268c826d24ac82052e Merged-In: I23fa5d10003637584f856738940f54bddb0657dc Merged-In: I585d00f30e8848563d74d3f244f073d91d5db268
2017-05-24Merge "Don't use algorithm parameters if missing salt or iteration count." ↵Adam Vartanian
am: 9fd196fcf0 am: dc3758ea55 am: fa175f7308 am: 7e0f44f7d1 Change-Id: I585d00f30e8848563d74d3f244f073d91d5db268
2017-05-24Merge "Don't use algorithm parameters if missing salt or iteration count." ↵Adam Vartanian
am: 9fd196fcf0 am: dc3758ea55 am: fa175f7308 Change-Id: I23fa5d10003637584f856738940f54bddb0657dc
2017-05-24Merge "Don't use algorithm parameters if missing salt or iteration count." ↵Adam Vartanian
am: 9fd196fcf0 am: dc3758ea55 Change-Id: Ib9a75057baff0bb923131b03e559f95feecaecff
2017-05-24Merge "Don't use algorithm parameters if missing salt or iteration count."Adam Vartanian
am: 9fd196fcf0 Change-Id: Id534a61fdd297b5a09589c495155d1fb18967dc4
2017-05-24Merge "Don't use algorithm parameters if missing salt or iteration count."android-o-preview-3Adam Vartanian
2017-05-22Don't use algorithm parameters if missing salt or iteration count.Adam Vartanian
The PBEKeySpec constructor doesn't allow an empty salt or iteration count, and throws an exception if it sees one. Bug: 38161557 Test: cts -m CtsLibcoreTestCases Change-Id: Ib03360275e3a820efddc8de472dd4044070fdaba
2017-03-30Merge "Remove an Android change that is causing a test to fail" am: ↵Adam Vartanian
49edf3ace6 am: e984dbf637 am: ee47698274 am: d651c2a01d Change-Id: Ifca174d85dcdb40ffceb0817972cad4201b94768
2017-03-30Merge "Remove an Android change that is causing a test to fail" am: ↵Adam Vartanian
49edf3ace6 am: e984dbf637 am: ee47698274 Change-Id: I2a0061d5b439e60e2192c89da225f9e4a0aa0e2c
2017-03-30Merge "Remove an Android change that is causing a test to fail" am: 49edf3ace6Adam Vartanian
am: e984dbf637 Change-Id: I957152c119dbcdfc4dafa36fee8275158a82af50
2017-03-30Merge "Remove an Android change that is causing a test to fail"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Adam Vartanian
am: 49edf3ace6 Change-Id: I5a86265b57641be1ddd39c073588aa33d99e5b27
2017-03-30Merge "Remove an Android change that is causing a test to fail"Adam Vartanian
2017-03-29Remove an Android change that is causing a test to failAdam Vartanian
We have a patch in KeyAgreementSpi that changes the set of exceptions that are caught from within Bouncy Castle from Exception to only IllegalStateException. This patch was introduced in the upgrade to BC 1.56, and there's no explanation why it was introduced. Prior to that upgrade, upstream caught no exceptions and we caught IllegalStateException. (See aosp/318406.) This shouldn't cause any problems for users, as the set of exceptions that is thrown by the internal key agreement class is an implementation detail and InvalidKeyException and IllegalStateException are the only documented exceptions thrown from KeyAgreement#doPhase() (which is the public API this backs), so any other exception type would be unexpected anyway. Bug: 36712087 Test: cts -m CtsLibcoreTestCases Change-Id: Idb18fe0cf7bcf5a86e8805c362941528249aad2a
2017-03-01Merge "Add a -testdex variant for ART run-tests." am: 6feb860f98 am: fa0d1f680aNicolas Geoffray
am: af944a69fe Change-Id: I1ee6b41054c522b8856fb1eb80b49e68b7e82f32
2017-03-01Merge "Add a -testdex variant for ART run-tests." am: 6feb860f98Nicolas Geoffray
am: fa0d1f680a Change-Id: Ic3881a958d383cc51c8146d1d8429c32c8cfb1b9
2017-03-01Merge "Add a -testdex variant for ART run-tests."Nicolas Geoffray
am: 6feb860f98 Change-Id: If1b7e05f15df5aa109bce475a8ea95f1b95bdb97
2017-03-01Merge "Add a -testdex variant for ART run-tests."android-o-preview-1android-n-mr2-preview-2o-previewNicolas Geoffray
2017-03-01Add a -testdex variant for ART run-tests.Nicolas Geoffray
bug:24535627 Change-Id: I091525f8a294686ecec0cd99d8222ed1796cd394
2017-02-14Merge "BouncyCastle: Enable EC AlgorithmParameters." am: cd2014ba37 am: ↵Adam Vartanian
2f73209199 am: 9e73c25399 am: dc359b399e Change-Id: I7385b0629c021a415c3ebfd8e838c5aba744986b
2017-02-14Merge "BouncyCastle: Enable EC AlgorithmParameters." am: cd2014ba37 am: ↵Adam Vartanian
2f73209199 am: 9e73c25399 Change-Id: I3fa9cf838b6d6e01c2acb6164fc5cbfb04a81378
2017-02-14Merge "BouncyCastle: Enable EC AlgorithmParameters." am: cd2014ba37Adam Vartanian
am: 2f73209199 Change-Id: I6434334811876dc189cdfd63d5af82e340660df3
2017-02-14Merge "BouncyCastle: Enable EC AlgorithmParameters."Adam Vartanian
am: cd2014ba37 Change-Id: I40b53614d013a967b6896e3d215e0d8b4ec80457
2017-02-14Merge "BouncyCastle: Enable EC AlgorithmParameters."Adam Vartanian
2017-02-13Merge "File needed for using the new X509v3 cert API" am: eebc649f31 am: ↵Kenny Root
57ca6b5946 am: d1a549df63 am: 0d816526a3 Change-Id: Id4b4ea30d748217a0ae33cd09a244e8b5b335b9d
2017-02-13Merge "File needed for using the new X509v3 cert API" am: eebc649f31 am: ↵Kenny Root
57ca6b5946 am: d1a549df63 Change-Id: Ie097fa356779fd9333d85788890c8c96cbd35865
2017-02-13Merge "File needed for using the new X509v3 cert API" am: eebc649f31Kenny Root
am: 57ca6b5946 Change-Id: Iaf832c94957b9296c39e78bf4fbca64c5f80e82a
2017-02-13Merge "File needed for using the new X509v3 cert API"Kenny Root
am: eebc649f31 Change-Id: I908b1061f22d39c3d1354aafb52133f175c78b41
2017-02-13Merge "File needed for using the new X509v3 cert API"Kenny Root
2017-02-10Merge "Remove unused Bouncycastle files" am: ab590bc300 am: 018d0a69e3 am: ↵Kenny Root
a48454c866 am: 72fac7156b Change-Id: Icacd63629d83ee5630b8871aaf3150524222b54a
2017-02-10Merge "Remove unused Bouncycastle files" am: ab590bc300 am: 018d0a69e3Kenny Root
am: a48454c866 Change-Id: I8107d619a3f386bba50c1c1d2946d399ebc24088
2017-02-10Merge "Remove unused Bouncycastle files" am: ab590bc300Kenny Root
am: 018d0a69e3 Change-Id: I207e94aafba91810a69d74f2565de5d3db8ba9f2
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 16:01:42 +0000