Commit Graph
18 Commits
Author SHA1 Message Date
Kenny RootandAndroid Git Automerger 267ec09d5d am e84e9310: am eade3a80: Merge "Remove superfluous OpenSSL include paths."
* commit 'e84e931040a4f77aea14aca4c756940f3891d977':
  Remove superfluous OpenSSL include paths.
2015-01-23 03:59:27 +00:00
Kenny RootandAndroid Git Automerger e84e931040 am eade3a80: Merge "Remove superfluous OpenSSL include paths."
* commit 'eade3a800effe8f8fb89c8a2da12831bc5ba3239':
  Remove superfluous OpenSSL include paths.
2015-01-23 01:20:52 +00:00
Kenny RootandGerrit Code Review eade3a800e Merge "Remove superfluous OpenSSL include paths." 2015-01-23 01:10:00 +00:00
Kenny RootandAndroid Git Automerger 9f6bfa302a am fc7eab96: am f4a6ab27: Merge "Add support for ECDSA signatures"
* commit 'fc7eab961f9dc85ee88e8c37ca1dc31a7f7b8331':
  Add support for ECDSA signatures
2013-10-14 14:12:49 -07:00
Kenny RootandAndroid Git Automerger fc7eab961f am f4a6ab27: Merge "Add support for ECDSA signatures"
* commit 'f4a6ab27b335b69fbc419a9c1ef263004b561265':
  Add support for ECDSA signatures
2013-10-14 14:08:21 -07:00
Kenny RootandGerrit Code Review f4a6ab27b3 Merge "Add support for ECDSA signatures" 2013-10-14 21:04:56 +00:00
Kenny Root 7a4adb5268 Add support for ECDSA signatures
This adds support for key version 5 which is an EC key using the NIST
P-256 curve parameters. OTAs may be signed with these keys using the
ECDSA signature algorithm with SHA-256.

Change-Id: Id88672a3deb70681c78d5ea0d739e10f839e4567
2013-10-10 14:19:19 -07:00
Kenny RootandAndroid Git Automerger a0d9ddb8f2 am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp
* commit 'cd74108cdac228e946ca8b6ea2ff11ab62941a6d':
  Remove HAVE_SELINUX guards
2012-10-16 17:49:23 -07:00
Kenny Root cd74108cda resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp
Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457
2012-10-16 17:44:21 -07:00
Kenny RootandGerrit Code Review 78afed1c15 Merge "Remove HAVE_SELINUX guards" 2012-10-16 16:33:40 -07:00
Kenny Root 7eb7567aa3 Remove HAVE_SELINUX guards
Change-Id: Ia96201f20f7838d7d9e8926208977d3f8318ced4
2012-10-16 12:57:26 -07:00
Kenny Root 038818cb63 Update merge for SELinux to compile
The contribution of SELinux things to AOSP had a call to the old
ui_print that merged cleanly. This changes that call into the newer
call so it will actually compile when enabled.

Change-Id: I8368e937219b01d0bef06007fa46302415256d07
2012-04-08 11:03:04 -07:00
Kenny Root 41dda82d84 resolved conflicts for merge of 0b1fee1b to master
Change-Id: I2e8298ff5988a96754f56f80a5186c9605ad9928
2012-03-30 21:26:01 -07:00
Kenny RootandAndroid Git Automerger ba634dc9f7 am c78a9698: am ecc76ba5: Set adbd to be disabled by default in recovery
Merge commit 'c78a9698dd55a165c2206c380f87f173bacba2aa'

* commit 'c78a9698dd55a165c2206c380f87f173bacba2aa':
  Set adbd to be disabled by default in recovery
2010-06-28 12:28:45 -07:00
Kenny RootandAndroid Git Automerger 4fef81a5a9 am ecc76ba5: Set adbd to be disabled by default in recovery
Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into froyo-plus-aosp

* commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab':
  Set adbd to be disabled by default in recovery
2010-06-28 12:24:46 -07:00
Kenny RootandAndroid Git Automerger c78a9698dd am ecc76ba5: Set adbd to be disabled by default in recovery
Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into gingerbread

* commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab':
  Set adbd to be disabled by default in recovery
2010-06-28 12:24:16 -07:00
Kenny Root ecc76ba551 Set adbd to be disabled by default in recovery
Change-Id: I74fa6edc4b001247b20be52e8301d18407fede2c
2010-06-28 09:01:22 -07:00
Kenny Root 21854ccdb2 Filename check and free allocated strings
Make sure file is valid before we try to read it. Also free all the
strings we allocate in various functions so we don't leak memory.

Change-Id: Ica3c8dae992e73718c79c12ff5d7e315c290caea
2010-02-17 18:33:44 -08:00