scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 02:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

vboot2: be consistent in use of sig_algorithm vs sig_alg in vboot2 structs

Browse Source 
Previously, we had a mix of sig_algorithm and sig_alg member names,
and it was hard to remember which struct used which variant.  Prefer
sig_alg because of the 80-column limit.  Same with hash_alg
vs. hash_algorithm

BUG=chromium:423882
BRANCH=none
TEST=VBOOT2=1 make runtests

Change-Id: Ifbb60f3172549e29efc0fb1f7f693efa51eb7cc3
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/226943
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
This commit is contained in:
Randall Spangler
2014-11-01 15:55:26 -07:00
committed by chrome-internal-fetch
parent 6b5b8f65d5
commit 6300a6439e
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/2lib/include/2struct.h
View File

@@ -368,14 +368,14 @@ struct vb2_packed_key2 {
uint32_t key_size;
/* Signature algorithm used by the key (enum vb2_signature_algorithm) */
uint16_t sig_algorithm;
uint16_t sig_alg;
/*
* Hash digest algorithm used with the key (enum vb2_hash_algorithm).
* This is explicitly specified as part of the key to prevent use of a
* strong key with a weak hash.
*/
uint16_t hash_algorithm;
uint16_t hash_alg;
/* Key version */
uint32_t key_version;
@@ -413,10 +413,10 @@ struct vb2_signature2 {
uint32_t data_size;
/* Signature algorithm used (enum vb2_signature_algorithm) */
uint16_t sig_algorithm;
uint16_t sig_alg;
/* Hash digest algorithm used (enum vb2_hash_algorithm) */
uint16_t hash_algorithm;
uint16_t hash_alg;
/*
* GUID of key used to generate this signature. This allows the
@@ -538,7 +538,7 @@ struct vb2_fw_preamble2 {
* Hash algorithm used (must be same for all entries) (enum
* vb2_hash_algorithm).
*/
uint16_t hash_algorithm;
uint16_t hash_alg;
/* Size of each hash entry, in bytes */
uint16_t hash_entry_size;