diff options
| author | Randall Spangler <rspangler@chromium.org> | 2014-10-17 16:41:46 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-10-22 00:30:30 +0000 |
| commit | 9504754fee346569b4cdcaae9f54fa65cf3005d9 (patch) | |
| tree | 15cc3bdeb43cfa07da60898cc4d2eee9e3792514 /firmware/2lib/2rsa.c | |
| parent | 6df3e33912baf2633ed27fce6fe166d87e2f04a8 (diff) | |
| download | vboot-9504754fee346569b4cdcaae9f54fa65cf3005d9.tar.gz | |
vboot2: move verify digest to 2common
This removes code duplicated between 2common.c and 2rsa.c. This is in
preparation for adding new unsigned hash algorithms.
BUG=chromium:423882
BRANCH=none
TEST=VBOOT2=1 make -j runtests
Change-Id: Ic9c542ae14d3b7f786129c1d52f8963847a94fb8
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/224780
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'firmware/2lib/2rsa.c')
| -rw-r--r-- | firmware/2lib/2rsa.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/firmware/2lib/2rsa.c b/firmware/2lib/2rsa.c index c4c9420a..1df91157 100644 --- a/firmware/2lib/2rsa.c +++ b/firmware/2lib/2rsa.c @@ -165,7 +165,9 @@ uint32_t vb2_rsa_sig_size(uint32_t algorithm) uint32_t vb2_packed_key_size(uint32_t algorithm) { - if (algorithm >= VB2_ALG_COUNT) + uint32_t sig_size = vb2_rsa_sig_size(algorithm); + + if (!sig_size) return 0; /* @@ -173,7 +175,7 @@ uint32_t vb2_packed_key_size(uint32_t algorithm) * 2 * key_len bytes for the n and rr arrays * + sizeof len + sizeof n0inv. */ - return 2 * vb2_rsa_sig_size(algorithm) + 2 * sizeof(uint32_t); + return 2 * sig_size + 2 * sizeof(uint32_t); } /* @@ -274,10 +276,10 @@ int vb2_check_padding(uint8_t *sig, int algorithm) return result ? VB2_ERROR_RSA_PADDING : VB2_SUCCESS; } -int vb2_verify_digest(const struct vb2_public_key *key, - uint8_t *sig, - const uint8_t *digest, - struct vb2_workbuf *wb) +int vb2_rsa_verify_digest(const struct vb2_public_key *key, + uint8_t *sig, + const uint8_t *digest, + struct vb2_workbuf *wb) { struct vb2_workbuf wblocal = *wb; uint32_t *workbuf32; @@ -288,7 +290,7 @@ int vb2_verify_digest(const struct vb2_public_key *key, if (!key || !sig || !digest) return VB2_ERROR_RSA_VERIFY_PARAM; - if (key->algorithm >= VB2_ALG_COUNT) { + if (key->algorithm > VB2_ALG_RSA8192_SHA512) { VB2_DEBUG("Invalid signature type!\n"); return VB2_ERROR_RSA_VERIFY_ALGORITHM; } |