mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-04 14:00:19 +00:00 
			
		
		
		
	Update libavb to commit 5fbb42a189aa in AOSP/master, because new version
has support for super partition [1], which we need for implementing
Android dynamic partitions. All changes from previous patches for libavb
in U-Boot are accounted for in this commit:
  - commit ecc6f6bea6a2 ("libavb: Handle wrong hashtree_error_mode in
                          avb_append_options()")
  - commit 897a1d947e7e ("libavb: Update SPDX tag style")
  - commit d8f9d2af96b3 ("avb2.0: add Android Verified Boot 2.0 library")
Tested on X15:
    ## Android Verified Boot 2.0 version 1.1.0
    read_is_device_unlocked not supported yet
    read_rollback_index not supported yet
    read_is_device_unlocked not supported yet
    Verification passed successfully
    AVB verification OK.
Unit test passes:
    $ ./test/py/test.py --bd sandbox --build -k test_avb
      test/py/tests/test_android/test_avb.py ss..s.
[1] 49936b4c01
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Eugeniu Rosca <rosca.eugeniu@gmail.com>
Acked-by: Igor Opaniuk <igor.opaniuk@gmail.com>
		
	
			
		
			
				
	
	
		
			74 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* SPDX-License-Identifier: MIT */
 | 
						|
/*
 | 
						|
 * Copyright (C) 2016 The Android Open Source Project
 | 
						|
 */
 | 
						|
 | 
						|
#ifdef AVB_INSIDE_LIBAVB_H
 | 
						|
#error "You can't include avb_sha.h in the public header libavb.h."
 | 
						|
#endif
 | 
						|
 | 
						|
#ifndef AVB_COMPILATION
 | 
						|
#error "Never include this file, it may only be used from internal avb code."
 | 
						|
#endif
 | 
						|
 | 
						|
#ifndef AVB_CMDLINE_H_
 | 
						|
#define AVB_CMDLINE_H_
 | 
						|
 | 
						|
#include "avb_ops.h"
 | 
						|
#include "avb_slot_verify.h"
 | 
						|
 | 
						|
/* Maximum allow length (in bytes) of a partition name, including
 | 
						|
 * ab_suffix.
 | 
						|
 */
 | 
						|
#define AVB_PART_NAME_MAX_SIZE 32
 | 
						|
 | 
						|
#define AVB_MAX_NUM_CMDLINE_SUBST 10
 | 
						|
 | 
						|
/* Holds information about command-line substitutions. */
 | 
						|
typedef struct AvbCmdlineSubstList {
 | 
						|
  size_t size;
 | 
						|
  char* tokens[AVB_MAX_NUM_CMDLINE_SUBST];
 | 
						|
  char* values[AVB_MAX_NUM_CMDLINE_SUBST];
 | 
						|
} AvbCmdlineSubstList;
 | 
						|
 | 
						|
/* Substitutes all variables (e.g. $(ANDROID_SYSTEM_PARTUUID)) with
 | 
						|
 * values. Returns NULL on OOM, otherwise the cmdline with values
 | 
						|
 * replaced.
 | 
						|
 */
 | 
						|
char* avb_sub_cmdline(AvbOps* ops,
 | 
						|
                      const char* cmdline,
 | 
						|
                      const char* ab_suffix,
 | 
						|
                      bool using_boot_for_vbmeta,
 | 
						|
                      const AvbCmdlineSubstList* additional_substitutions);
 | 
						|
 | 
						|
AvbSlotVerifyResult avb_append_options(
 | 
						|
    AvbOps* ops,
 | 
						|
    AvbSlotVerifyFlags flags,
 | 
						|
    AvbSlotVerifyData* slot_data,
 | 
						|
    AvbVBMetaImageHeader* toplevel_vbmeta,
 | 
						|
    AvbAlgorithmType algorithm_type,
 | 
						|
    AvbHashtreeErrorMode hashtree_error_mode,
 | 
						|
    AvbHashtreeErrorMode resolved_hashtree_error_mode);
 | 
						|
 | 
						|
/* Allocates and initializes a new command line substitution list. Free with
 | 
						|
 * |avb_free_cmdline_subst_list|.
 | 
						|
 */
 | 
						|
AvbCmdlineSubstList* avb_new_cmdline_subst_list(void);
 | 
						|
 | 
						|
/* Use this instead of |avb_free| to deallocate a AvbCmdlineSubstList. */
 | 
						|
void avb_free_cmdline_subst_list(AvbCmdlineSubstList* cmdline_subst);
 | 
						|
 | 
						|
/* Adds a hashtree root digest to be substituted in $(AVB_*_ROOT_DIGEST)
 | 
						|
 * variables. The partition name differentiates the variable. For example, if
 | 
						|
 * |part_name| is "foo" then $(AVB_FOO_ROOT_DIGEST) will be substituted with the
 | 
						|
 * hex encoding of the digest. The substitution will be added to
 | 
						|
 * |out_cmdline_subst|. Returns AVB_SLOT_VERIFY_RESULT_OK on success.
 | 
						|
 */
 | 
						|
AvbSlotVerifyResult avb_add_root_digest_substitution(
 | 
						|
    const char* part_name,
 | 
						|
    const uint8_t* digest,
 | 
						|
    size_t digest_size,
 | 
						|
    AvbCmdlineSubstList* out_cmdline_subst);
 | 
						|
 | 
						|
#endif
 |