mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-11-24 02:05:01 +00:00
ca72512866
Futility needs to link against both vboot1/vboot2.0 and vboot2.1 functions. This was easy in the past because it did (vboot1 + vboot2.1) and there's no overlap. In replacing vboot1 function calls and structs with vboot2.0, now there are symbol collisions between vboot2.0 and vboot2.1. For example, both of them use a struct called vb2_signature, but the structs are defined differently. Functions which operate on those structs also overload. Rename the vb2.1 structs to start with vb21_ instead of vb2_. Do the same for vb2.1 functions which operate on vb2.1 data. BUG=chromium:611535 BRANCH=none TEST=make runtests Change-Id: I24defd87cbd9ef64239faf1a8e98ab2372d27539 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/347458 Reviewed-by: Daisuke Nojiri <dnojiri@google.com>
83 lines
2.1 KiB
C
83 lines
2.1 KiB
C
/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*
|
|
* Host functions for keyblocks
|
|
*/
|
|
|
|
#include "2sysincludes.h"
|
|
#include "2common.h"
|
|
#include "2rsa.h"
|
|
#include "host_common.h"
|
|
#include "host_fw_preamble2.h"
|
|
#include "host_key2.h"
|
|
#include "host_keyblock2.h"
|
|
#include "host_misc.h"
|
|
#include "host_signature2.h"
|
|
#include "vb21_common.h"
|
|
|
|
int vb21_fw_preamble_create(struct vb21_fw_preamble **fp_ptr,
|
|
const struct vb2_private_key *signing_key,
|
|
const struct vb21_signature **hash_list,
|
|
uint32_t hash_count,
|
|
uint32_t fw_version,
|
|
uint32_t flags,
|
|
const char *desc)
|
|
{
|
|
struct vb21_fw_preamble fp = {
|
|
.c.magic = VB21_MAGIC_FW_PREAMBLE,
|
|
.c.struct_version_major = VB21_FW_PREAMBLE_VERSION_MAJOR,
|
|
.c.struct_version_minor = VB21_FW_PREAMBLE_VERSION_MAJOR,
|
|
.c.fixed_size = sizeof(fp),
|
|
.c.desc_size = vb2_desc_size(desc),
|
|
.flags = flags,
|
|
.fw_version = fw_version,
|
|
.hash_count = hash_count,
|
|
};
|
|
|
|
uint32_t hash_next;
|
|
uint32_t sig_size;
|
|
uint8_t *buf;
|
|
int i;
|
|
|
|
*fp_ptr = NULL;
|
|
|
|
/* Determine component sizes */
|
|
hash_next = fp.hash_offset = fp.c.fixed_size + fp.c.desc_size;
|
|
|
|
for (i = 0; i < hash_count; i++)
|
|
hash_next += hash_list[i]->c.total_size;
|
|
|
|
fp.sig_offset = hash_next;
|
|
|
|
if (vb21_sig_size_for_key(&sig_size, signing_key, NULL))
|
|
return VB2_FW_PREAMBLE_CREATE_SIG_SIZE;
|
|
|
|
fp.c.total_size = fp.sig_offset + sig_size;
|
|
|
|
/* Allocate buffer and copy components */
|
|
buf = calloc(fp.c.total_size, 1);
|
|
if (!buf)
|
|
return VB2_FW_PREAMBLE_CREATE_ALLOC;
|
|
|
|
memcpy(buf, &fp, sizeof(fp));
|
|
if (fp.c.desc_size)
|
|
strcpy((char *)buf + fp.c.fixed_size, desc);
|
|
|
|
hash_next = fp.hash_offset;
|
|
for (i = 0; i < hash_count; i++) {
|
|
memcpy(buf + hash_next, hash_list[i],
|
|
hash_list[i]->c.total_size);
|
|
hash_next += hash_list[i]->c.total_size;
|
|
}
|
|
|
|
/* Sign the preamble */
|
|
if (vb21_sign_object(buf, fp.sig_offset, signing_key, NULL)) {
|
|
free(buf);
|
|
return VB2_FW_PREAMBLE_CREATE_SIGN;
|
|
}
|
|
|
|
*fp_ptr = (struct vb21_fw_preamble *)buf;
|
|
return VB2_SUCCESS;
|
|
}
|