-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dm-verity: put dm-verity info inside AVB2 if AVB2 is enabled [1/1]
PD#SWPL-88784 Problem: Irdeto requests to support AVB2 chained partition Solution: 1. Move dm-verity info into vbmeta 2. Notice: the partition size is hardcoded in config file when AVB2 chained partition is enabled, for example, see conf/machine/mesonsc2-ah212.config DEVICE_PROPERTY_SYSTEM_PARTITION_SIZE = "0x60000000" DEVICE_PROPERTY_VENDOR_PARTITION_SIZE = "0x1C000000" If the partition is changed, please modify the related partition size accordingly. Verify: AH219 Change-Id: I868cb9d94b3640065f65356ae21de57689de62bc Signed-off-by: Matthew Shyu <[email protected]>
- Loading branch information
Matthew Shyu
committed
Aug 9, 2022
1 parent
85613ce
commit aab8ce5
Showing
15 changed files
with
5,228 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| inherit aml-dm-verity-img | ||
|
|
||
| #AVB with DM-verity | ||
| AVB_DM_VERITY = '${@bb.utils.contains('DISTRO_FEATURES', 'dm-verity', bb.utils.contains('DISTRO_FEATURES', 'AVB', 'true', 'false' ,d), 'false', d)}' | ||
| CHAINED_PARTITION_SUPPORT = "${@bb.utils.contains('DISTRO_FEATURES', 'AVB_chained_partition', 'true', 'false', d)}" | ||
| DEPENDS += '${@'python3-native openssl-native avbtool-dm-verity-native avbkey-native' if AVB_DM_VERITY == 'true' else ''}' | ||
|
|
||
| def is_numeric_base(s, base): | ||
| try: | ||
| value = int(s, base) | ||
| return True | ||
| except ValueError: | ||
| return False | ||
|
|
||
| python create_avb_dm_verity_image () { | ||
| deploy_dir_image = d.getVar('DEPLOY_DIR_IMAGE', True) | ||
| dm_verity_image = d.getVar('DM_VERITY_IMAGE', True) | ||
| dm_verity_image_type = d.getVar('DM_VERITY_IMAGE_TYPE', True) | ||
| name = d.getVar('AVB_DM_VERITY_PARTITON_NAME', True) | ||
| chained = d.getVar('CHAINED_PARTITION_SUPPORT', True) | ||
| partition_size = d.getVar('AVB_DMVERITY_PARTITON_SIZE', True) | ||
| sysconfdir = d.getVar('sysconfdir_native', True) | ||
| native_dir = d.getVar('STAGING_DIR_NATIVE', True) | ||
| key = d.getVar('AVB_DMVERITY_SIGNINING_KEY', True) | ||
| algorithm = d.getVar('AVB_DMVERITY_SIGNINING_ALGORITHM', True) | ||
| filename = deploy_dir_image + '/' + dm_verity_image + '.' + dm_verity_image_type + '.verity.env' | ||
| verity_array = dict() | ||
| try: | ||
| with open(filename, 'r') as verity_env: | ||
| bb.note('parsing ' + filename) | ||
| for item in verity_env.readlines(): | ||
| if '#' not in item: | ||
| data = item.rstrip('\n').partition('=') | ||
| verity_array[data[0]] = data[2] | ||
| except FileNotFoundError: | ||
| bb.error('Cannot find ' + filename) | ||
|
|
||
| for data in verity_array: | ||
| bb.note(data + ' = ' + verity_array[data]) | ||
|
|
||
| image_deploy_dir = d.getVar('IMGDEPLOYDIR', True) | ||
| machine = d.getVar('MACHINE', True) | ||
| # pad to 4096 bytes to match img2simg | ||
| cmd = 'avbtool-dm-verity.py add_footer_without_hashtree' + ' --image ' + image_deploy_dir + '/' + dm_verity_image + '-' + machine + '.ext4' + ' --partition_name ' + name + ' --root_digest ' + verity_array['ROOT_HASH'] + ' --salt ' + verity_array['SALT'] + ' --hash_algorithm sha256 ' + ' --data_block_size ' + verity_array['DATA_BLOCK_SIZE'] + ' --hash_block_size ' + verity_array['HASH_BLOCK_SIZE'] + ' --data_size ' + verity_array['DATA_SIZE'] + ' --padding_size 4096' | ||
| if chained == 'true': | ||
| cmd += ' --key ' + native_dir + '/' + sysconfdir + '/' + key + ' --algorithm ' + algorithm | ||
| bb.note(cmd) | ||
| bb.process.run(cmd) | ||
| if isinstance(partition_size , str) and is_numeric_base(partition_size, 10) or is_numeric_base(partition_size, 16): | ||
| cmd = 'avbtool-dm-verity.py resize_image' + ' --image ' + image_deploy_dir + '/' + dm_verity_image + '-' + machine + '.ext4' + ' --partition_size ' + partition_size | ||
| bb.note(cmd) | ||
| bb.process.run(cmd) | ||
| } | ||
|
|
||
| IMAGE_POSTPROCESS_COMMAND += '${@'create_avb_dm_verity_image' if AVB_DM_VERITY == 'true' else ''}' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| Code in this repo uses one or more of the following licenses. | ||
| Refer to each file to determine which licenses apply. | ||
|
|
||
| ------------------------------------------------------------------------- | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining | ||
| a copy of this software and associated documentation files (the | ||
| "Software"), to deal in the Software without restriction, including | ||
| without limitation the rights to use, copy, modify, merge, publish, | ||
| distribute, sublicense, and/or sell copies of the Software, and to | ||
| permit persons to whom the Software is furnished to do so, subject to | ||
| the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be | ||
| included in all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
|
||
| ------------------------------------------------------------------------- | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
|
|
||
| ------------------------------------------------------------------------- | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions | ||
| are met: | ||
| 1. Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| 2. Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
| 3. Neither the name of the project nor the names of its contributors | ||
| may be used to endorse or promote products derived from this software | ||
| without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND | ||
| ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE | ||
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| SUCH DAMAGE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| DESCRIPTION = "Android Verified Boot 2.0 Test Keys" | ||
| LICENSE = "APACHE" | ||
| LIC_FILES_CHKSUM = "file://${COREBASE}/../meta-meson/license/APACHE;md5=b8228f2369d92593f53f0a0685ebd3c0" | ||
|
|
||
| SRC_URI += "file://testkey_rsa2048.pem" | ||
| SRC_URI += "file://testkey_rsa4096.avbpubkey" | ||
| SRC_URI += "file://testkey_rsa4096.pem" | ||
|
|
||
| inherit native | ||
| S = "${WORKDIR}" | ||
|
|
||
| do_configure[noexec] = "1" | ||
| do_compile[noexec] = "1" | ||
|
|
||
| do_install() { | ||
| install -d ${D}${sysconfdir} | ||
| install -m 0755 ${S}/testkey_rsa2048.pem ${D}${sysconfdir} | ||
| install -m 0755 ${S}/testkey_rsa4096.pem ${D}${sysconfdir} | ||
| install -m 0755 ${S}/testkey_rsa4096.avbpubkey ${D}${sysconfdir} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| DESCRIPTION = "Android Verified Boot 2.0 with Linux DM-Verity support" | ||
| LICENSE = "APACHE" | ||
| LIC_FILES_CHKSUM = "file://${COREBASE}/../meta-meson/license/APACHE;md5=b8228f2369d92593f53f0a0685ebd3c0" | ||
|
|
||
| SRC_URI = "file://avbtool-dm-verity.py" | ||
| S = "${WORKDIR}" | ||
|
|
||
| do_configure[noexec] = "1" | ||
| do_compile[noexec] = "1" | ||
|
|
||
| do_install() { | ||
| install -d ${D}${bindir} | ||
| install -m 0755 ${S}/avbtool-dm-verity.py ${D}${bindir} | ||
| } | ||
|
|
||
| BBCLASSEXTEND = "native" |
Oops, something went wrong.