summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-24merge in lmp-mr1-release history after reset to lmp-mr1-devandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-cts-releaselinaro_android_5.1.1The Android Automerger
2014-11-21Merge "Add a reference C implementation for verifying signatures" into ↵android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devPaul Lawrence
lmp-mr1-dev
2014-11-21Add a reference C implementation for verifying signaturesSami Tolvanen
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
2014-11-20Support [-j <journal_size>] in mkuserimg.shYing Wang
automerge: 8f85f69 * commit '8f85f69f43dc3a2943d33d0d47740b2528a0735f': Support [-j <journal_size>] in mkuserimg.sh
2014-11-20merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-11-19Support [-j <journal_size>] in mkuserimg.shYing Wang
Bug: 18430740 (cherry picked from commit 1ec61e7ac5fd7553b143231e8d650ef4ba432344) Change-Id: I8704dfd4f91373261b03d7943e40cc9fdf39a0a7
2014-11-19merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-11-18Support [-j <journal_size>] in mkuserimg.shYing Wang
Bug: 18430740 Change-Id: Ia76cd4ef1b35c48c60c4922d7d28b21978d56159
2014-11-17Add signature verification to keystore and verity signersSami Tolvanen
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
2014-11-17merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-11-14Fix comments in BootSignature.java.Sami Tolvanen
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
2014-11-13DO NOT MERGE: Implement boot signature verificationSami Tolvanen
Adds signature verification support to BootSignature.java. Bug: 15984840 Bug: 18120110 Change-Id: Ib1a67573bdcd0f41e2d920f518de15993c8750e0 (cherry picked from commit 7999c089cfa82d63d4a28606c78b381b74509175)
2014-11-13DO NOT MERGE: Update keystore and verity metadata signersSami Tolvanen
Use the same PKCS8 format as every other signing tool, and update the signature format to use SHA-256 instead of SHA-1. Bug: 15984840 Bug: 18120110 Change-Id: I6ac9e3594b5ae572f5b6763f3bd5b1bdb6ba2ad2 (cherry picked from commit 19c6bb5fe97c877976ef79762c6051223b8d2213)
2014-11-13DO NOT MERGE: Support converting X.509 cert into a verity public keySami Tolvanen
fs_mgr requires an RSA public key in mincrypt format for verifying dm-verity hash tables. Add support for extracting public keys from existing X.509 certificates and converting it into mincrypt format for use with fs_mgr. Bug: 15984840 Bug: 18120110 Change-Id: Ibcdca116cdc32dfa33d8f5636ec728244cbf6fd5 (cherry picked from commit 82d824a6b5028930abd87ecd870924c72d3b3931)
2014-11-13DO NOT MERGE: Add a tool for verifying verity signatures in imagesSami Tolvanen
This tool takes a sparse ext4 image file, reads verity metadata from it, and verifies the signature of the verity table. Bug: 15984840 Bug: 18120110 Change-Id: I384a9ff885a0ffcd8febf100e76f3a1e5c7bbdab (cherry picked from commit c18aa9d69a69549b50966e322abe59cfa04edfe4)
2014-11-13Reinstate "Update boot image signature format to version 1"Paul Lawrence
This reverts commit 7377e002421ed9a04cc94cd808c234f48d93924d. Change-Id: I4b1d83b62ae4d4dd6952663744b1171b3e0d0766 Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-11-13Revert "Update boot image signature format to version 1"Paul Lawrence
This reverts commit b62eabde2db40f01dfed1cef48ac2cbabdff4d03. Change-Id: I98019b7990c5436fe6ad5ef1052729478bccbe17
2014-11-13Update boot image signature format to version 1Sami Tolvanen
Add the full X.509v3 certificate to the signature footer for easier verification. Change-Id: Ic969e9c1e4ab1a25ffdde2ab818b8edf2ad95253 (cherry picked from commit f67d3764c641e53d4a1b925b4d02fec92b7e894a)
2014-11-13Fix issues with appended boot signature.Geremy Condra
In particular this changes the OID to the SHA1 OID and appends the full BootSignature. This is cherry-picked from a WIP bug checked into master, but is complete. The work in finalized by further changes from Sami Tolvanen Bug: 15984840 Change-Id: Ic43784fc339b9aedf91363c9ec9a453c3bb53294 (cherry picked from commit 1f2ebbd57e86fb0749aeb453fb337065985ab9c6)
2014-11-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-11-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-11-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-11-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-11-03merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-11-02merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-11-01merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-30merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-29merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-28merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-27merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-26merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-25merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-23merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-22merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-21merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-20merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-19merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-18merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-16merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-15merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-14merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-13merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-12merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-11merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-09merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-07merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62
2014-10-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
844b2e166c6218018e9676994cff8d5d2a8cbf62