scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-05 22:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

g: have key-ladder functions grab the SHA lock

Browse Source 
Key-ladder operations require use of the hardware
SHA engine, thus grab the SHA lock prior to executing
any key-ladder operations.

BRANCH=none
BUG=chrome-os-partner:55331
TEST=TCG tests pass

Change-Id: Ib9bce3b37894e56ff8858b08cba973d04d3a016e
Signed-off-by: nagendra modadugu <ngm@google.com>
Reviewed-on: https://chromium-review.googlesource.com/430314
Commit-Ready: Marius Schilder <mschilder@chromium.org>
Tested-by: Marius Schilder <mschilder@chromium.org>
Reviewed-by: Marius Schilder <mschilder@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
This commit is contained in:
nagendra modadugu
2017-01-18 18:14:50 -08:00
committed by chrome-bot
parent b828305a9b
commit 8bbb0f2472
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
chip/g/dcrypto/key_ladder.c
View File

@@ -1,4 +1,4 @@
/* Copyright 2016 The Chromium OS Authors. All rights reserved.
/* Copyright 2017 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.
*/
@@ -7,7 +7,7 @@
#include "endian.h"
#include "registers.h"
void DCRYPTO_ladder_init(void)
static void ladder_init(void)
{
/* Do not reset keyladder engine here, as before.
*
@@ -16,13 +16,10 @@ void DCRYPTO_ladder_init(void)
* Reset will make this flow work, but will have broken
* the other pending sha flow.
* Hence leave as is and observe the error.
*
* TODO: hw sha engine usage and keyladder usage cannot
* interleave and should share a semaphore.
*/
}
int DCRYPTO_ladder_step(uint32_t cert)
static int ladder_step(uint32_t cert)
{
uint32_t itop;
@@ -51,7 +48,7 @@ static int compute_certs(const uint32_t *certs, size_t num_certs)
int i;
for (i = 0; i < num_certs; i++) {
if (DCRYPTO_ladder_step(certs[i]))
if (ladder_step(certs[i]))
return 0;
}
@@ -86,25 +83,38 @@ static const uint32_t FRK2_CERTS_POSTFIX[] = {
int DCRYPTO_ladder_compute_frk2(size_t fw_version, uint8_t *frk2)
{
int i;
int result = 0;
if (fw_version > MAX_MAJOR_FW_VERSION)
return 0;
DCRYPTO_ladder_init();
if (!compute_certs(FRK2_CERTS_PREFIX, ARRAY_SIZE(FRK2_CERTS_PREFIX)))
if (!dcrypto_grab_sha_hw())
return 0;
for (i = 0; i < MAX_MAJOR_FW_VERSION - fw_version; i++) {
if (DCRYPTO_ladder_step(KEYMGR_CERT_25))
return 0;
}
do {
int i;
if (!compute_certs(FRK2_CERTS_POSTFIX, ARRAY_SIZE(FRK2_CERTS_POSTFIX)))
return 0;
ladder_init();
memcpy(frk2, (void *) GREG32_ADDR(KEYMGR, HKEY_FRR0),
AES256_BLOCK_CIPHER_KEY_SIZE);
return 1;
if (!compute_certs(FRK2_CERTS_PREFIX,
ARRAY_SIZE(FRK2_CERTS_PREFIX)))
break;
for (i = 0; i < MAX_MAJOR_FW_VERSION - fw_version; i++) {
if (ladder_step(KEYMGR_CERT_25))
break;
}
if (!compute_certs(FRK2_CERTS_POSTFIX,
ARRAY_SIZE(FRK2_CERTS_POSTFIX)))
break;
memcpy(frk2, (void *) GREG32_ADDR(KEYMGR, HKEY_FRR0),
AES256_BLOCK_CIPHER_KEY_SIZE);
result = 1;
} while (0);
dcrypto_release_sha_hw();
return result;
}