diff options
| author | Randall Spangler <rspangler@chromium.org> | 2014-11-01 15:55:26 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-05 06:05:06 +0000 |
| commit | 6300a6439e121ac41ad336c7422dcdbb0d649c7c (patch) | |
| tree | 04e8ad6d1a0fe05a4989511fe19d6ee2f40974af /firmware/2lib/include | |
| parent | 6b5b8f65d52bc91ca37e5cb484867251d81136b1 (diff) | |
| download | vboot-6300a6439e121ac41ad336c7422dcdbb0d649c7c.tar.gz | |
vboot2: be consistent in use of sig_algorithm vs sig_alg in vboot2 structs
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>
Diffstat (limited to 'firmware/2lib/include')
| -rw-r--r-- | firmware/2lib/include/2struct.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/2lib/include/2struct.h b/firmware/2lib/include/2struct.h index be5ba034..bfe23559 100644 --- a/firmware/2lib/include/2struct.h +++ b/firmware/2lib/include/2struct.h @@ -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; |