OSDN Git Service
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:04 +0000 (18:57 +0000)]
am
a2d22663: am
ebb4d67d: Don\'t export ARCH and SUBARCH, set them explicitly
* commit '
a2d22663d69b33aa481f9ab09785737a8030c5f3':
Don't export ARCH and SUBARCH, set them explicitly
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:02 +0000 (18:57 +0000)]
am
29af476c: am
b6b1fc33: Add a README file.
* commit '
29af476c281c2bcfcc4eba59557a1a3b3a1cfaf3':
Add a README file.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:01 +0000 (18:57 +0000)]
am
5d0fd290: am
6ef3e4fd: Kernel networking test scripts using UML.
* commit '
5d0fd290142522e2eed98eb80b616e8e67f29e3f':
Kernel networking test scripts using UML.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:08 +0000 (03:29 +0000)]
am
ebb4d67d: Don\'t export ARCH and SUBARCH, set them explicitly
* commit '
ebb4d67dbf10140dd48675bc8726013ce3e514f4':
Don't export ARCH and SUBARCH, set them explicitly
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:07 +0000 (03:29 +0000)]
am
b6b1fc33: Add a README file.
* commit '
b6b1fc335e4a82f7b2d22ce2f7243649f2fbe13d':
Add a README file.
Lorenzo Colitti [Wed, 4 Feb 2015 03:23:25 +0000 (03:23 +0000)]
am
6ef3e4fd: Kernel networking test scripts using UML.
* commit '
6ef3e4fdfd823b08aca5ea2c2368e956b5e0eaea':
Kernel networking test scripts using UML.
Lorenzo Colitti [Fri, 28 Mar 2014 04:16:12 +0000 (13:16 +0900)]
Don't export ARCH and SUBARCH, set them explicitly
Change-Id: I1f3637202e78ba1c9448769251e641ba0af17624
Lorenzo Colitti [Fri, 28 Mar 2014 01:18:43 +0000 (10:18 +0900)]
Add a README file.
Change-Id: Iaf13f68c96f3ebbd611dc668689d468d5b0261fd
Lorenzo Colitti [Thu, 27 Mar 2014 11:10:14 +0000 (20:10 +0900)]
Kernel networking test scripts using UML.
Change-Id: I28a9901e01a53e3dde551b6c8abf6391fe4354a4
Elliott Hughes [Fri, 30 Jan 2015 21:27:43 +0000 (21:27 +0000)]
am
7a0b43b9: am
22669b72: Merge "Add missing includes."
* commit '
7a0b43b908ed6fd77c22ca4506b7b1d008747bf9':
Add missing includes.
Elliott Hughes [Fri, 30 Jan 2015 21:16:15 +0000 (21:16 +0000)]
am
22669b72: Merge "Add missing includes."
* commit '
22669b72523d4aee0f5756515c42df82ed67eda7':
Add missing includes.
Elliott Hughes [Fri, 30 Jan 2015 06:25:28 +0000 (06:25 +0000)]
Merge "Add missing includes."
Elliott Hughes [Fri, 30 Jan 2015 05:26:35 +0000 (21:26 -0800)]
Add missing includes.
Change-Id: Ie3acca064c1bcecb4e0305e61f01ba8cea4abe03
Elliott Hughes [Thu, 29 Jan 2015 18:37:04 +0000 (18:37 +0000)]
am
8dd5f33b: am
9b1f7c8f: Merge "Add missing <string.h> include."
* commit '
8dd5f33b9c982006990a43ae81d64b30c8e9aedb':
Add missing <string.h> include.
Elliott Hughes [Thu, 29 Jan 2015 16:46:30 +0000 (16:46 +0000)]
am
9b1f7c8f: Merge "Add missing <string.h> include."
* commit '
9b1f7c8f3f7f8d52992fc48146dc0362b01dadf3':
Add missing <string.h> include.
Elliott Hughes [Thu, 29 Jan 2015 06:30:28 +0000 (06:30 +0000)]
Merge "Add missing <string.h> include."
Elliott Hughes [Thu, 29 Jan 2015 06:28:13 +0000 (22:28 -0800)]
Add missing <string.h> include.
Change-Id: I7262823b75bbcce47697fe246f6c8e902a931c8c
Elliott Hughes [Wed, 28 Jan 2015 22:07:58 +0000 (22:07 +0000)]
am
cf7827cd: am
7efbc114: Merge "Add missing <string.h> include."
* commit '
cf7827cd9a3ae6205dab693a0052ad22ee4e12aa':
Add missing <string.h> include.
Elliott Hughes [Wed, 28 Jan 2015 19:26:23 +0000 (19:26 +0000)]
am
7efbc114: Merge "Add missing <string.h> include."
* commit '
7efbc1146e91258fecb69ac06c3f52b68afe312e':
Add missing <string.h> include.
Elliott Hughes [Wed, 28 Jan 2015 19:19:36 +0000 (19:19 +0000)]
Merge "Add missing <string.h> include."
Elliott Hughes [Wed, 28 Jan 2015 19:18:24 +0000 (11:18 -0800)]
Add missing <string.h> include.
Change-Id: Iffdfed00ac49a7920844fa5f9e1a3ffc6a77e641
Kenny Root [Mon, 26 Jan 2015 19:17:38 +0000 (19:17 +0000)]
am
c3a0cfbf: am
fcd4849c: Merge "Remove superfluous OpenSSL include paths."
* commit '
c3a0cfbfb7016ef2a639a7b5ac930f81c6516f10':
Remove superfluous OpenSSL include paths.
Kenny Root [Mon, 26 Jan 2015 19:12:23 +0000 (19:12 +0000)]
am
fcd4849c: Merge "Remove superfluous OpenSSL include paths."
* commit '
fcd4849c30a5e81ed494b0392e175d2d9be67ab7':
Remove superfluous OpenSSL include paths.
Kenny Root [Mon, 26 Jan 2015 18:53:14 +0000 (18:53 +0000)]
Merge "Remove superfluous OpenSSL include paths."
Geremy Condra [Fri, 23 Jan 2015 19:55:11 +0000 (19:55 +0000)]
am
32de2663: am
89919a03: Merge "Include bn.h for BN_ functions."
* commit '
32de2663470bc0c98511b62d6d922f356a382ec5':
Include bn.h for BN_ functions.
Adam Langley [Fri, 23 Jan 2015 01:18:02 +0000 (17:18 -0800)]
Remove superfluous OpenSSL include paths.
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.
Change-Id: I9b5360bb3af65a629c3e7bc6963a7fac78879c5f
Geremy Condra [Thu, 22 Jan 2015 00:13:20 +0000 (00:13 +0000)]
am
89919a03: Merge "Include bn.h for BN_ functions."
* commit '
89919a03f0eee8f9413c0ed64ef0e7fd5388557b':
Include bn.h for BN_ functions.
Geremy Condra [Wed, 21 Jan 2015 18:39:57 +0000 (18:39 +0000)]
Merge "Include bn.h for BN_ functions."
Adam Langley [Wed, 21 Jan 2015 02:25:27 +0000 (18:25 -0800)]
Include bn.h for BN_ functions.
The BN_ functions used in this source file require bn.h to be included.
At the moment, a transitive include via evp.h is keeping the build
working, but we shouldn't depend on that.
Change-Id: I7153f29ca61d53e6abb7a9df78d0c6aceccafdb2
Elliott Hughes [Thu, 8 Jan 2015 18:03:46 +0000 (18:03 +0000)]
am
8d8b586c: am
368d0a31: Merge "make_ext4fs: workaround for a glibc scandir bug"
* commit '
8d8b586c8414298d0f11cec5d840017366ab1bf6':
make_ext4fs: workaround for a glibc scandir bug
Elliott Hughes [Thu, 8 Jan 2015 17:57:43 +0000 (17:57 +0000)]
am
368d0a31: Merge "make_ext4fs: workaround for a glibc scandir bug"
* commit '
368d0a31ffb0613dadd2e6b5e7929d8d7b15f764':
make_ext4fs: workaround for a glibc scandir bug
Elliott Hughes [Thu, 8 Jan 2015 17:46:31 +0000 (17:46 +0000)]
Merge "make_ext4fs: workaround for a glibc scandir bug"
Mihai Serban [Wed, 7 Jan 2015 10:44:24 +0000 (12:44 +0200)]
make_ext4fs: workaround for a glibc scandir bug
Due to a bug in glibc scandir the make_ext4fs tool fails sometimes
with error message:
"error: build_directory_structure: scandir: Cannot allocate memory"
A simple retry of the failed scandir in case errno is ENOMEM
greatly increases the chances to finish the operation successfully.
The scandir bug is reported here:
https://sourceware.org/bugzilla/show_bug.cgi?id=17804
Change-Id: I87fa283106c0215e4b358459022497d9ec1edb60
Signed-off-by: Mihai Serban <mihai.serban@intel.com>
David 'Digit' Turner [Mon, 5 Jan 2015 16:14:40 +0000 (16:14 +0000)]
am
b4d460b1: resolved conflicts for merge of
3701548f to lmp-mr1-dev-plus-aosp
* commit '
b4d460b11db6c16f921b0badae29ec684f079d15':
ext4_utils: Support -L LABEL option on mkuserimg
David 'Digit' Turner [Mon, 5 Jan 2015 16:08:40 +0000 (17:08 +0100)]
resolved conflicts for merge of
3701548f to lmp-mr1-dev-plus-aosp
Change-Id: I186fcab7c0d55c1cb60a56429792601f6ae6f2e0
David Turner [Mon, 5 Jan 2015 15:32:31 +0000 (15:32 +0000)]
Merge "ext4_utils: Support -L LABEL option on mkuserimg"
Elliott Hughes [Tue, 30 Dec 2014 12:27:40 +0000 (12:27 +0000)]
am
dc645aa1: am
c8e992de: Merge "Fix missing #includes in system/extras."
* commit '
dc645aa1161d070855bd2345b4b62c90353ab00d':
Fix missing #includes in system/extras.
Elliott Hughes [Tue, 30 Dec 2014 12:21:16 +0000 (12:21 +0000)]
am
c8e992de: Merge "Fix missing #includes in system/extras."
* commit '
c8e992de8e6464d84bdfbad495997618b85b9075':
Fix missing #includes in system/extras.
Elliott Hughes [Mon, 29 Dec 2014 21:17:25 +0000 (21:17 +0000)]
Merge "Fix missing #includes in system/extras."
Elliott Hughes [Mon, 29 Dec 2014 20:29:50 +0000 (12:29 -0800)]
Fix missing #includes in system/extras.
Change-Id: I78000cea6b2012f571e596ed400b3f04847cb761
Christoffer Dall [Wed, 17 Dec 2014 20:35:37 +0000 (21:35 +0100)]
ext4_utils: Support -L LABEL option on mkuserimg
When creating Android images it is practical to be able to specify a
filesystem label on the image files, which can be used to identify
images for the right mount point.
Change-Id: If0cefab3bb8ee27d2da15741ea709f1583ebb2e0
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Yabin Cui [Wed, 10 Dec 2014 21:57:05 +0000 (21:57 +0000)]
am
3b5ccfb9: am
e37c6986: Merge "Add missing fcntl.h for pagingtest.c."
* commit '
3b5ccfb9b65da8658e47e0b2d819bb917a8bc145':
Add missing fcntl.h for pagingtest.c.
Yabin Cui [Wed, 10 Dec 2014 21:57:04 +0000 (21:57 +0000)]
am
7c6015df: am
97c6f43c: Merge "Change file to include sys/time.h directly."
* commit '
7c6015df19195749a29e40908c0178f2b6ea9690':
Change file to include sys/time.h directly.
Yabin Cui [Wed, 10 Dec 2014 06:43:13 +0000 (06:43 +0000)]
am
e37c6986: Merge "Add missing fcntl.h for pagingtest.c."
* commit '
e37c6986b7db382fa93d2fbf9b679681efa60016':
Add missing fcntl.h for pagingtest.c.
Yabin Cui [Wed, 10 Dec 2014 06:31:02 +0000 (06:31 +0000)]
Merge "Add missing fcntl.h for pagingtest.c."
Yabin Cui [Wed, 10 Dec 2014 06:29:50 +0000 (22:29 -0800)]
Add missing fcntl.h for pagingtest.c.
Change-Id: I32ff00c9e00978b0d5787beb96c2bd1ad3455910
Yabin Cui [Wed, 10 Dec 2014 06:05:04 +0000 (06:05 +0000)]
am
97c6f43c: Merge "Change file to include sys/time.h directly."
* commit '
97c6f43c51ac6efa2174fef523276494b9975011':
Change file to include sys/time.h directly.
Yabin Cui [Wed, 10 Dec 2014 05:49:33 +0000 (05:49 +0000)]
Merge "Change file to include sys/time.h directly."
Yabin Cui [Wed, 10 Dec 2014 05:13:23 +0000 (21:13 -0800)]
Change file to include sys/time.h directly.
Bug:
18627763
Change-Id: Iba26399ab1ae1ae2a37246415bec02d9f9f7c300
Stephen Hines [Thu, 4 Dec 2014 20:44:16 +0000 (20:44 +0000)]
am
87b0c235: am
5ebcac32: Merge "Use "-z muldefs" to work around duplicate symbol issues."
* commit '
87b0c235513927371fe50f81ca3f9074f3348360':
Use "-z muldefs" to work around duplicate symbol issues.
Stephen Hines [Thu, 4 Dec 2014 19:52:17 +0000 (19:52 +0000)]
am
5ebcac32: Merge "Use "-z muldefs" to work around duplicate symbol issues."
* commit '
5ebcac32772426a8bc0cb0cd15502207f1476011':
Use "-z muldefs" to work around duplicate symbol issues.
Stephen Hines [Thu, 4 Dec 2014 02:51:30 +0000 (02:51 +0000)]
Merge "Use "-z muldefs" to work around duplicate symbol issues."
Stephen Hines [Tue, 2 Dec 2014 18:41:37 +0000 (10:41 -0800)]
Use "-z muldefs" to work around duplicate symbol issues.
Bug:
18389563
The duplicate symbols arise as part of a compiler-rt update, which impacts
libc++_static.a (and causes conflicts with the symbols in libgcc.a).
Change-Id: I67d25c5ffcf6bbf199593a07917b1dc739301a57
Dan Albert [Fri, 28 Nov 2014 05:49:12 +0000 (05:49 +0000)]
am
d4de6c05: am
f511e6a2: Merge "Fix build in C++11 mode"
* commit '
d4de6c0537e1f23b2722d4de64f6187096bb1ad6':
Fix build in C++11 mode
Dan Albert [Fri, 28 Nov 2014 05:45:20 +0000 (05:45 +0000)]
am
f511e6a2: Merge "Fix build in C++11 mode"
* commit '
f511e6a2fa049753f64bd737a4d74ff0f88cc611':
Fix build in C++11 mode
Dan Albert [Fri, 28 Nov 2014 05:34:38 +0000 (05:34 +0000)]
Merge "Fix build in C++11 mode"
Bernhard Rosenkränzer [Fri, 28 Nov 2014 00:57:48 +0000 (01:57 +0100)]
Fix build in C++11 mode
"PRIu64 is a C++11 literal -- fix it by adding a space
Change-Id: I760bfc31b47c87adbc9d9f224ecfbf08fffcc2e2
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Elliott Hughes [Thu, 27 Nov 2014 14:01:42 +0000 (14:01 +0000)]
am
0b0a8ed2: am
50fd9b41: Merge "bionic libc tests: clean up the tests for setjmp"
* commit '
0b0a8ed24236b757bab9148630fdabe0a8213ffc':
bionic libc tests: clean up the tests for setjmp
Elliott Hughes [Thu, 27 Nov 2014 13:54:44 +0000 (13:54 +0000)]
am
50fd9b41: Merge "bionic libc tests: clean up the tests for setjmp"
* commit '
50fd9b419e75a0468e89fee48a26c622edf03b75':
bionic libc tests: clean up the tests for setjmp
Elliott Hughes [Thu, 27 Nov 2014 03:43:34 +0000 (03:43 +0000)]
Merge "bionic libc tests: clean up the tests for setjmp"
Elliott Hughes [Tue, 25 Nov 2014 19:56:29 +0000 (19:56 +0000)]
am
f2e49d82: am
9f5593c7: Merge "Remove reference to dead init.testmenu."
* commit '
f2e49d82d8d7c0c8bbd42f2f138a6d39756bbc95':
Remove reference to dead init.testmenu.
Elliott Hughes [Tue, 25 Nov 2014 18:52:25 +0000 (18:52 +0000)]
am
9f5593c7: Merge "Remove reference to dead init.testmenu."
* commit '
9f5593c779babb916914e29bb3ae9e5c7b04f907':
Remove reference to dead init.testmenu.
Sami Tolvanen [Tue, 25 Nov 2014 17:39:22 +0000 (17:39 +0000)]
Merge "Add EC support back to signing tools"
Sami Tolvanen [Mon, 24 Nov 2014 15:19:18 +0000 (15:19 +0000)]
Add EC support back to signing tools
Even though RSA is the only supported algorithm in various
places, add EC support back to Utils.java to allow potential
use in future.
Change-Id: I1e0afbf133c9a6b9edc3873160697cb7c27ea29e
Elliott Hughes [Mon, 24 Nov 2014 21:06:48 +0000 (21:06 +0000)]
Merge "Remove reference to dead init.testmenu."
Elliott Hughes [Mon, 24 Nov 2014 20:00:36 +0000 (12:00 -0800)]
Remove reference to dead init.testmenu.
Change-Id: Ibca7ba5f0129c26900b9833c1dc34b86ed8e8e54
Sami Tolvanen [Tue, 18 Nov 2014 19:45:09 +0000 (19:45 +0000)]
Validate the full image in VerityVerifier
Check the entire image against the verity hash tree, instead of
merely verifying the signature. For signature verification, add
support for mincrypt public key format used by fs_mgr.
Bug:
18502074
Change-Id: I5f81a52e16fc86220d649cc550c6f726d67b16fb
Paul Lawrence [Sat, 22 Nov 2014 02:42:01 +0000 (02:42 +0000)]
am
f7291480: am
17ba6f0d: Merge "Add a reference C implementation for verifying signatures" into lmp-mr1-dev
* commit '
f7291480caaa469e4d01140b7894eb33679f340c':
Add a reference C implementation for verifying signatures
Paul Lawrence [Sat, 22 Nov 2014 02:33:23 +0000 (02:33 +0000)]
am
17ba6f0d: Merge "Add a reference C implementation for verifying signatures" into lmp-mr1-dev
* commit '
17ba6f0d475126d0a89d5f276d0973bc87df6bc9':
Add a reference C implementation for verifying signatures
Dan Albert [Fri, 21 Nov 2014 23:59:16 +0000 (23:59 +0000)]
am
bc07fb68: am
0bb5c17b: Merge "Make memtrack an optional module."
* commit '
bc07fb6864db9eb206ef4fcbe2916aefd1fe6ff6':
Make memtrack an optional module.
Paul Lawrence [Fri, 21 Nov 2014 23:38:27 +0000 (23:38 +0000)]
Merge "Add a reference C implementation for verifying signatures" into lmp-mr1-dev
Dan Albert [Fri, 21 Nov 2014 22:23:27 +0000 (22:23 +0000)]
am
0bb5c17b: Merge "Make memtrack an optional module."
* commit '
0bb5c17b81fb042c62e11c744c081ee4378c6a1c':
Make memtrack an optional module.
Dan Albert [Fri, 21 Nov 2014 22:13:08 +0000 (22:13 +0000)]
Merge "Make memtrack an optional module."
Dan Albert [Fri, 21 Nov 2014 21:43:57 +0000 (13:43 -0800)]
Make memtrack an optional module.
This isn't really _needed_ (someone correct me if I'm wrong), and
right now it's preventing some of us from building for flounder
because of the segfaults in ld.
Change-Id: I5bdf81e1daca757e332447af61523c9e2b941a70
Sami Tolvanen [Thu, 20 Nov 2014 13:22:58 +0000 (13:22 +0000)]
Add a reference C implementation for verifying signatures
Due to OEM requests, add a reference implementation for boot/recovery
image signature verification in C. The tool uses OpenSSL for ASN.1 and
crypto routines.
Bug:
18120110
Change-Id: I9f6c59e0b338b68f35ac1c2c4d83c10d31d70cd9
Dan Albert [Fri, 21 Nov 2014 03:09:46 +0000 (03:09 +0000)]
am
2ec9b4e4: am
e1eaca2e: Merge "More C++11 compatibility."
* commit '
2ec9b4e4156fdfc6027382fc6db51dce9383cc40':
More C++11 compatibility.
Ying Wang [Fri, 21 Nov 2014 02:56:28 +0000 (02:56 +0000)]
am
5b80f5db: Support [-j <journal_size>] in mkuserimg.sh automerge:
8f85f69 automerge:
4ea0822
* commit '
5b80f5dbfd8a3f1fbe180094153fbfdb4b1e242d':
Support [-j <journal_size>] in mkuserimg.sh
Dan Albert [Fri, 21 Nov 2014 02:52:43 +0000 (02:52 +0000)]
am
e1eaca2e: Merge "More C++11 compatibility."
* commit '
e1eaca2e35770216fb46ae363ccf050289a7b054':
More C++11 compatibility.
Dan Albert [Fri, 21 Nov 2014 02:41:41 +0000 (02:41 +0000)]
Merge "More C++11 compatibility."
Ying Wang [Fri, 21 Nov 2014 02:38:14 +0000 (02:38 +0000)]
Support [-j <journal_size>] in mkuserimg.sh automerge:
8f85f69
automerge:
4ea0822
* commit '
4ea082291fdfd14969e537fe9f999bc380a98010':
Support [-j <journal_size>] in mkuserimg.sh
Dan Albert [Fri, 21 Nov 2014 02:32:52 +0000 (18:32 -0800)]
More C++11 compatibility.
Bug:
18466763
Change-Id: Ia308b7c8017cfdb7bebf5c307730ef3f0ef6f572
Ying Wang [Thu, 20 Nov 2014 20:22:42 +0000 (20:22 +0000)]
Support [-j <journal_size>] in mkuserimg.sh
automerge:
8f85f69
* commit '
8f85f69f43dc3a2943d33d0d47740b2528a0735f':
Support [-j <journal_size>] in mkuserimg.sh
Ying Wang [Wed, 19 Nov 2014 02:06:56 +0000 (18:06 -0800)]
Support [-j <journal_size>] in mkuserimg.sh
Bug:
18430740
(cherry picked from commit
1ec61e7ac5fd7553b143231e8d650ef4ba432344)
Change-Id: I8704dfd4f91373261b03d7943e40cc9fdf39a0a7
Ying Wang [Wed, 19 Nov 2014 19:29:25 +0000 (19:29 +0000)]
am
1ec61e7a: Support [-j <journal_size>] in mkuserimg.sh
automerge:
fda7067
* commit '
fda706777aced79ff0bd807e910645e2804f3d92':
Support [-j <journal_size>] in mkuserimg.sh
Ying Wang [Wed, 19 Nov 2014 19:28:25 +0000 (19:28 +0000)]
am
1ec61e7a: Support [-j <journal_size>] in mkuserimg.sh
* commit '
1ec61e7ac5fd7553b143231e8d650ef4ba432344':
Support [-j <journal_size>] in mkuserimg.sh
Ying Wang [Wed, 19 Nov 2014 02:06:56 +0000 (18:06 -0800)]
Support [-j <journal_size>] in mkuserimg.sh
Bug:
18430740
Change-Id: Ia76cd4ef1b35c48c60c4922d7d28b21978d56159
Sami Tolvanen [Tue, 18 Nov 2014 16:27:31 +0000 (16:27 +0000)]
am
241f964e: Add signature verification to keystore and verity signers
automerge:
8f1cedd
* commit '
8f1cedd29647df65223a5e063fb97d34363c9908':
Add signature verification to keystore and verity signers
Sami Tolvanen [Tue, 18 Nov 2014 16:27:23 +0000 (16:27 +0000)]
am
241f964e: Add signature verification to keystore and verity signers
* commit '
241f964e10ce8bc6c401073854fdaf1662013dae':
Add signature verification to keystore and verity signers
Sami Tolvanen [Tue, 18 Nov 2014 09:14:18 +0000 (09:14 +0000)]
Reapply comment changes from failed am
40193d94
Comment updates from commit
40193d94 were removed while fixing
a merge conflict. This change reapplies them to bring master back
to the same revision as lmp-mr1-dev.
Change-Id: Id6cd8fab7f13ada4077cb2edfc17681086f16611
Sami Tolvanen [Fri, 14 Nov 2014 14:51:25 +0000 (14:51 +0000)]
Add signature verification to keystore and verity signers
This change adds -verify flags to keystore and verity signers for
verifying the signatures of the signed content generated by the
same tools. This allows implementers of verified boot to test and
verify the correctness of their implementations.
Bug:
15984840
Change-Id: I327de9c3a9e035cd11dc5022e978c840cd37581c
Dan Albert [Sun, 16 Nov 2014 17:36:27 +0000 (17:36 +0000)]
am
d2a8aad0: Merge "Move system/extras to libc++."
automerge:
933a482
* commit '
933a4826984a11b1dca1d5df6ac4de762042268e':
Move system/extras to libc++.
Dan Albert [Sun, 16 Nov 2014 17:35:38 +0000 (17:35 +0000)]
am
d2a8aad0: Merge "Move system/extras to libc++."
* commit '
d2a8aad0cd6dfa5f3d3b1fa1162cdcc9601588fc':
Move system/extras to libc++.
Dan Albert [Sun, 16 Nov 2014 17:27:04 +0000 (17:27 +0000)]
Merge "Move system/extras to libc++."
Dan Albert [Sun, 16 Nov 2014 02:50:10 +0000 (18:50 -0800)]
Move system/extras to libc++.
Bug:
15193147
Change-Id: I2188179aa315b6b94493135cfb243d5a9018fd10
Dmitriy Ivanov [Fri, 14 Nov 2014 18:42:25 +0000 (10:42 -0800)]
resolved conflicts for merge of
ccaf574b to master
Change-Id: I83fd35ac579f05e7ae8e006e85791942dcefaf06
Sami Tolvanen [Fri, 14 Nov 2014 17:17:44 +0000 (17:17 +0000)]
am
40193d94: Fix comments in BootSignature.java.
* commit '
40193d94182934b37f4b2ae00fde2402583e59e1':
Fix comments in BootSignature.java.
Sami Tolvanen [Fri, 14 Nov 2014 11:00:18 +0000 (11:00 +0000)]
Fix comments in BootSignature.java.
Clearly mark the comment above main() as an example and fix
the parameters in the example command. Also briefly document
the arguments in the main function for clarity.
Bug:
18376609
Change-Id: I84eaf75799a8128100eb97c70e04563c609e9928
Sami Tolvanen [Fri, 14 Nov 2014 00:03:55 +0000 (00:03 +0000)]
am
3380f2fe: DO NOT MERGE: Implement boot signature verification
* commit '
3380f2fea1b9a18f26ae95b60a01eeb55565eb1b':
DO NOT MERGE: Implement boot signature verification
Sami Tolvanen [Fri, 14 Nov 2014 00:03:54 +0000 (00:03 +0000)]
am
f0f33adb: DO NOT MERGE: Update keystore and verity metadata signers
* commit '
f0f33adb7ce6557459306ce03576af4d79c0c9ef':
DO NOT MERGE: Update keystore and verity metadata signers
Sami Tolvanen [Fri, 14 Nov 2014 00:03:53 +0000 (00:03 +0000)]
am
8d7e9240: DO NOT MERGE: Support converting X.509 cert into a verity public key
* commit '
8d7e92406cdccb94f853d9ffcdc95dcdde37b47a':
DO NOT MERGE: Support converting X.509 cert into a verity public key
OSDN Git Service
