OSDN Git Service
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:12 +0000 (18:57 +0000)]
am
2dc786c2: am
d6d303df: Support adding outgoing interface rules.
* commit '
2dc786c25474e2ea5744bb30ad38c8cf9a43d247':
Support adding outgoing interface rules.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:11 +0000 (18:57 +0000)]
am
531b835b: am
460fefc3: Refactor setup and common code into a superclass.
* commit '
531b835b28def455f4955a3f7660c2f48f6fdefd':
Refactor setup and common code into a superclass.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:10 +0000 (18:57 +0000)]
am
f155520f: am
cabf6eb8: Updates to mark_test.
* commit '
f155520fb74e9d601009a6192e9863b194f5b6dc':
Updates to mark_test.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:10 +0000 (18:57 +0000)]
am
03aadee7: am
15654338: Add support for reading routing rules.
* commit '
03aadee76b6a33aca717da133c934ba0e82ae24a':
Add support for reading routing rules.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:09 +0000 (18:57 +0000)]
am
33393652: am
2466e38e: Add a module for dealing with C-style structs.
* commit '
33393652318f18e32dfc6b7f5e767a79c82562a0':
Add a module for dealing with C-style structs.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:08 +0000 (18:57 +0000)]
am
678d9ce9: am
d2dab451: Support setting the priority of rules.
* commit '
678d9ce93a569cc4a6ec701f276c9913b728f4b4':
Support setting the priority of rules.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:08 +0000 (18:57 +0000)]
am
63f8e91f: am
9c53e8a6: Move ip rule functionality to Python.
* commit '
63f8e91fa671f8131be93585303b140db1c6aa1b':
Move ip rule functionality to Python.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:07 +0000 (18:57 +0000)]
am
606f26c7: am
124b5aae: Fix lint warnings.
* commit '
606f26c78bb59ec3132106ded5f85e62cc036402':
Fix lint warnings.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:06 +0000 (18:57 +0000)]
am
c9b4a450: am
a25ebd97: Improve MarkTest.
* commit '
c9b4a450e25100c6ee9cc10139dbd11c26ed26a6':
Improve MarkTest.
Lorenzo Colitti [Wed, 4 Feb 2015 18:57:05 +0000 (18:57 +0000)]
am
7b1a16f4: am
717357af: Test mark-based routing for outgoing packets.
* commit '
7b1a16f4e0c49024abe24a68e587c293c2b805bf':
Test mark-based routing for outgoing packets.
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:16 +0000 (03:29 +0000)]
am
d6d303df: Support adding outgoing interface rules.
* commit '
d6d303df685e53f93d2a9e15496d2fc083928b74':
Support adding outgoing interface rules.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:15 +0000 (03:29 +0000)]
am
460fefc3: Refactor setup and common code into a superclass.
* commit '
460fefc3d5298acaec30377aef26b9f06472d53d':
Refactor setup and common code into a superclass.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:14 +0000 (03:29 +0000)]
am
cabf6eb8: Updates to mark_test.
* commit '
cabf6eb8a9816682c90d11cd84cb59d0f2d7f4c9':
Updates to mark_test.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:14 +0000 (03:29 +0000)]
am
15654338: Add support for reading routing rules.
* commit '
15654338bcd6d12f8d360007d38d2e71056da29f':
Add support for reading routing rules.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:13 +0000 (03:29 +0000)]
am
2466e38e: Add a module for dealing with C-style structs.
* commit '
2466e38ed01367dd81b1f9b5251040c202e94d0e':
Add a module for dealing with C-style structs.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:12 +0000 (03:29 +0000)]
am
d2dab451: Support setting the priority of rules.
* commit '
d2dab4516b902bdaef56a00c14e0121fd5bc18a9':
Support setting the priority of rules.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:12 +0000 (03:29 +0000)]
am
9c53e8a6: Move ip rule functionality to Python.
* commit '
9c53e8a60125235f0c2263a06ba9a9d2b5419f2c':
Move ip rule functionality to Python.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:11 +0000 (03:29 +0000)]
am
124b5aae: Fix lint warnings.
* commit '
124b5aae8ca65731b363d898e2da7a543e4b0e3e':
Fix lint warnings.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:10 +0000 (03:29 +0000)]
am
a25ebd97: Improve MarkTest.
* commit '
a25ebd97dd121c7f89e59fa440b86ffc9822d012':
Improve MarkTest.
Lorenzo Colitti [Wed, 4 Feb 2015 03:29:09 +0000 (03:29 +0000)]
am
717357af: Test mark-based routing for outgoing packets.
* commit '
717357af1ea56f3474a17fb909efc0f86db31e15':
Test mark-based routing for outgoing packets.
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 [Tue, 8 Apr 2014 08:40:30 +0000 (17:40 +0900)]
Support adding outgoing interface rules.
Also add the ability for verbose debugging.
Change-Id: I7bc4b03bfdb30e554c2a6c9594845f2da6594e0f
Lorenzo Colitti [Tue, 8 Apr 2014 06:45:08 +0000 (15:45 +0900)]
Refactor setup and common code into a superclass.
Change-Id: Iee489954175de6eec12b711d6c3ebb9a64cfd6c3
Lorenzo Colitti [Fri, 4 Apr 2014 11:22:24 +0000 (20:22 +0900)]
Updates to mark_test.
1. UID routing.
- Also test per-UID routing, if supported by the kernel.
2. Sysctl changes.
- Refactor code that sets sysctls, and robustly restore them in
tearDown.
- Check for the TCP FWMARK reflect sysctl.
- Support separate sysctls for IPv4 and IPv6 mark reflection.
- Switch to using the per-interface RA sysctl, and configure
routing manually if it's not there.
3. Test coverage.
- Test TCP FIN and FIN+ACK. This not only increases coverage
but also makes the test more robust, since retransmitted FINs
won't confuse other reflection tests.
- Test behaviour with the mark sysctls off.
4. Robustness changes.
- Run the reflect and accept tests multiple times to help
expose any flaky behaviour.
- Skip multicast packets. This makes things more robust, as
previously, code that was expecting no packets would fail
because it would receive an RS instead.
5. Readability improvements.
- Move code around to make it a bit more readable.
Change-Id: Ieb5f81a1ec077d25d49b212cecbe82c527d69002
Lorenzo Colitti [Fri, 4 Apr 2014 11:18:37 +0000 (20:18 +0900)]
Add support for reading routing rules.
Change-Id: I24e04f691cb5688d87da0b880ce6000fcc22c781
Lorenzo Colitti [Fri, 4 Apr 2014 11:18:08 +0000 (20:18 +0900)]
Add a module for dealing with C-style structs.
Change-Id: I3faec98ba24aefe9c7eb211ac2c5f95f9f11e027
Lorenzo Colitti [Tue, 1 Apr 2014 08:20:47 +0000 (17:20 +0900)]
Support setting the priority of rules.
Change-Id: I625443a3a7491d16f07e5b7d03e87195adbe457f
Lorenzo Colitti [Tue, 1 Apr 2014 06:08:35 +0000 (15:08 +0900)]
Move ip rule functionality to Python.
This allows us to experiment with ip rules without having to
compile a modified ip binary for the VM architecture.
Change-Id: Ibb0bc510fc2b1686712b94fffae6f1cea26a82bf
Lorenzo Colitti [Mon, 31 Mar 2014 05:33:59 +0000 (14:33 +0900)]
Fix lint warnings.
Change-Id: I1eb3d3b5e182c77e77f33860fe48003ed4cb85cd
Lorenzo Colitti [Mon, 31 Mar 2014 04:25:48 +0000 (13:25 +0900)]
Improve MarkTest.
1. Add TCP SYN+ACK tests including syncookies and checks that
accepting connections succeeids and that the sockets returned
by accept() are marked.
2. Mark the tests more robust with respect to extra packets by
always explicitly expecting packets (including when testing
outgoing kernel-generated packets) and looking for them
anywhere in the queue instead of insisting they're the first
packet in the queue.
3. Make the tests more robust by using random source port,
disabling ICMP rate limits, setting SO_REUSEADDR, and
clearing queues more reliably.
4. Move from 2 to 4 interfaces (mostly made possible by the
robustness improvements above).
5. Use named constants instead of repeating the numbers in
multiple places.
Change-Id: I596e557a7eea02ccf603c812a9b8ea6f5b2f95da
Lorenzo Colitti [Fri, 28 Mar 2014 04:18:28 +0000 (13:18 +0900)]
Test mark-based routing for outgoing packets.
Change-Id: Ifd696803f22a29bae162ab1d21d7b3552b9b80d3
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.
OSDN Git Service
