d4b4f0a1e1
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc
...
am: 0b1ad23070
2017-04-11 19:59:59 +00:00
2d37855038
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours
...
am: 01574980eb
2017-04-11 19:59:59 +00:00
c800d82044
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5
...
am: 1bc2862ac5
2017-04-11 19:59:58 +00:00
0b1ad23070
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56
...
am: afddaba0cc
2017-04-11 19:55:28 +00:00
01574980eb
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490
...
am: cce7621064
2017-04-11 19:55:28 +00:00
1bc2862ac5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706
...
am: ebcba388f5
2017-04-11 19:55:28 +00:00
afddaba0cc
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc
...
am: bc8c8e4b56
2017-04-11 19:51:00 +00:00
cce7621064
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece
...
am: df5ee70490
2017-04-11 19:50:58 +00:00
ebcba388f5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc
...
am: 89054eb706
2017-04-11 19:50:57 +00:00
bc8c8e4b56
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29
...
am: ed33065bfc
2017-04-11 19:45:58 +00:00
df5ee70490
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374
...
am: 18ccbc2ece
2017-04-11 19:45:58 +00:00
89054eb706
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours
...
am: de0f0b8ecc
2017-04-11 19:45:57 +00:00
a309bc491d
Merge "ZipWriter: Keep LFH and CFH in sync"
2017-04-11 19:42:21 +00:00
18ccbc2ece
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours
...
am: f7903d4374
2017-04-11 19:39:58 +00:00
ed33065bfc
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434
...
am: 25c0d68d29
2017-04-11 19:39:57 +00:00
de0f0b8ecc
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426
...
am: 556afe82f2
2017-04-11 19:39:56 +00:00
25c0d68d29
Fix out of bound read in libziparchive am: d9fd1863f4
...
am: 6908996434
2017-04-11 19:34:28 +00:00
556afe82f2
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours
...
am: 2b4a6de426
2017-04-11 19:34:28 +00:00
f7903d4374
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
...
am: 368f3d273d
2017-04-11 19:34:26 +00:00
6908996434
Fix out of bound read in libziparchive
...
am: d9fd1863f4
2017-04-11 19:29:57 +00:00
368f3d273d
Do Not Merge: Fix out of bound read in libziparchive
...
am: a8d932f2a5
2017-04-11 19:29:57 +00:00
2b4a6de426
Do Not Merge: Fix out of bound read in libziparchive
...
am: 6fdfd58fe1
2017-04-11 19:29:56 +00:00
8f2c28d572
Moved include/backtrace to libbacktrace/include
...
Export libbacktrace_headers
Bug: 33241851
Test: Build sailfish
Change-Id: Iba310ffc21d17ba542bed954a960ab305037061c
2017-04-11 11:22:43 -07:00
eca1b3bdcc
Move adb backup/restore helptext to adb shell bu help.
...
Key/value support for adb backup was added in ag/1946677, and help text
for adb shell bu is added in ag/2088937. This CL points the user to this
helptext instead of keeping it here, since it can quickly get out of
sync.
BUG=36170696
Test: adb
Change-Id: Ic40679f421a32e60f292ad20b726a89bfff03349
2017-04-11 19:15:17 +01:00
31e27b7bea
Merge changes from topic 'trusty_km2_hal' am: a4b40020ef
...
am: e53621c1f2
2017-04-11 17:15:32 +00:00
dacd341a7a
Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: b37312a794
...
am: c0fbad2b2b
2017-04-11 17:06:57 +00:00
e53621c1f2
Merge changes from topic 'trusty_km2_hal'
...
am: a4b40020ef
2017-04-11 17:04:45 +00:00
c0fbad2b2b
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
...
am: b37312a794
2017-04-11 16:55:27 +00:00
a4b40020ef
Merge changes from topic 'trusty_km2_hal'
...
* changes:
trusty: keymaster: update device tests to use 2.0 API
trusty: keymaster: Implement abort
trusty: keymaster: Implement finish
trusty: keymaster: Implement update
trusty: keymaster: Implement begin
trusty: keymaster: Implement upgrade_key
trusty: keymaster: Implement attest_key
trusty: keymaster: Implement export_key
trusty: keymaster: Implement import_key
trusty: keymaster: Implement get_key_characteristics
trusty: keymaster: Implement generate_key
trusty: keymaster: Implement add_rng_entropy
trusty: keymaster: Implement configure
trusty: keymaster: Begin update from Keymaster 0.3 to 2.0
2017-04-11 16:52:45 +00:00
b37312a794
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
2017-04-11 16:19:16 +00:00
1f592779c5
Merge "Add a reasonably full implementation of gzip/gunzip/zcat." am: ca3de5562b
...
am: a16ad5d45c
2017-04-11 15:50:20 +00:00
a16ad5d45c
Merge "Add a reasonably full implementation of gzip/gunzip/zcat."
...
am: ca3de5562b
2017-04-11 15:46:19 +00:00
ca3de5562b
Merge "Add a reasonably full implementation of gzip/gunzip/zcat."
2017-04-11 15:40:32 +00:00
ab89b34b6f
Remove .(ll)ndk suffix from (ll)ndk_library
...
Soong handles these automatically now.
Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Merged-In: Ica4eedda51bb34db2f39d2c64ea436e1f633bfc3
Change-Id: Ica4eedda51bb34db2f39d2c64ea436e1f633bfc3
2017-04-11 15:14:28 +00:00
d987c9dd9e
ZipWriter: Keep LFH and CFH in sync
...
We change the GPB in the LocalFileHeader if the entry can not
have a trailing DataDescriptor. Make sure to patch the
CentralFileHeader to have the same bits set.
Modify ZipArchive to check that the data descriptor bit is consistent
between Central and Local file headers.
(cherry-pick of commit e0eca55fe6
2017-04-11 01:45:25 +00:00
4c44243c45
Merge "poll umount completion from /proc/mounts" am: 625a098573
...
am: cb4dadfb08
2017-04-11 01:00:51 +00:00
cb4dadfb08
Merge "poll umount completion from /proc/mounts"
...
am: 625a098573
2017-04-11 00:55:22 +00:00
625a098573
Merge "poll umount completion from /proc/mounts"
2017-04-11 00:34:00 +00:00
5020603116
trusty: keymaster: update device tests to use 2.0 API
...
Test: builds, ran trusty_keymaster_tipc on imx6ul
Change-Id: Ie9e8ee35ec31aead12adb348e6542a648b41fd7a
2017-04-10 17:33:49 -07:00
465615e538
trusty: keymaster: Implement abort
...
Test: builds
Change-Id: I8dfef740a75ff76aebd3ee63aa747e319193aaed
2017-04-10 17:33:49 -07:00
e57f3ce2bf
trusty: keymaster: Implement finish
...
Test: builds
Change-Id: I8505f428613176eea5373a459bbce0de17406c55
2017-04-10 17:33:49 -07:00
86eb966106
trusty: keymaster: Implement update
...
Test: builds
Change-Id: Ie411a4e7ae3b5242814777f2781e1d2508917bfa
2017-04-10 17:33:49 -07:00
d7da42c0fa
trusty: keymaster: Implement begin
...
Test: builds
Change-Id: Icb5470a8c95131ee3d68ab2ce41423302b9ed531
2017-04-10 17:33:49 -07:00
22812e9a30
trusty: keymaster: Implement upgrade_key
...
Test: builds
Change-Id: I2ce86be1cd2c2c35ded371b21cb6546c31e0014e
2017-04-10 17:33:49 -07:00
a256198b92
trusty: keymaster: Implement attest_key
...
Test: builds
Change-Id: Ic5bf59db43b4301cbc2fa216470b9f07de8336b0
2017-04-10 17:33:49 -07:00
4cbfa7f2f0
trusty: keymaster: Implement export_key
...
Test: builds
Change-Id: I47d1ed4144014fca47fdf67f9f4d2eb0d9b1eb8f
2017-04-10 17:33:49 -07:00
2d768669fa
trusty: keymaster: Implement import_key
...
Test: builds
Change-Id: Ie130df9958d0a75fdedb463a38ea2625e88940db
2017-04-10 17:33:49 -07:00
a02270fdd9
trusty: keymaster: Implement get_key_characteristics
...
Test: builds
Change-Id: I6e6a28d8eec5ff91a9e8c82597593857732407f3
2017-04-10 17:33:45 -07:00
e514dd8ad4
trusty: keymaster: Implement generate_key
...
Test: builds
Change-Id: Ib77e29709eed2e5f0cd16ed214db61f4257fcebd
2017-04-10 17:21:10 -07:00
126402aae7
trusty: keymaster: Implement add_rng_entropy
...
Test: builds
Change-Id: Iec5f61777f9b39136028d61acaf724b9fafb4492
2017-04-10 17:19:49 -07:00
Tianjie Xu