summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Collard <louiscollard@chromium.org>2020-02-12 14:28:44 +0800
committerCommit Bot <commit-bot@chromium.org>2020-04-15 03:38:58 +0000
commit1be9bec56ff870ace0ffbeca525d6143052f2bd5 (patch)
tree6bc2b7389356dffa235a22928ea0d4d397cd11f1
parenta7e802fd92049aecc41485a79c74e06d8e376b86 (diff)
downloadchrome-ec-1be9bec56ff870ace0ffbeca525d6143052f2bd5.tar.gz
ec: Run clang-format on u2f.c
Also replaces uses of 'unsigned' with 'unsigned int' BUG=b:123686979 TEST=make buildall -j Change-Id: I2c7a861540f4ca3491b78f0c87e77ed01f57f0a0 Signed-off-by: Louis Collard <louiscollard@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2102090 Tested-by: Leo Lai <cylai@google.com> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Leo Lai <cylai@google.com>
-rw-r--r--common/u2f.c51
1 files changed, 21 insertions, 30 deletions
diff --git a/common/u2f.c b/common/u2f.c
index 4d4d603132..3bfae15fe6 100644
--- a/common/u2f.c
+++ b/common/u2f.c
@@ -35,11 +35,11 @@ static void deinterleave64(const uint8_t *in, uint8_t *a, uint8_t *b)
}
/* (un)wrap w/ the origin dependent KEK. */
-static int wrap_kh(const uint8_t *origin, const uint8_t *in,
- uint8_t *out, enum encrypt_mode mode)
+static int wrap_kh(const uint8_t *origin, const uint8_t *in, uint8_t *out,
+ enum encrypt_mode mode)
{
uint8_t kek[SHA256_DIGEST_SIZE];
- uint8_t iv[AES_BLOCK_LEN] = {0};
+ uint8_t iv[AES_BLOCK_LEN] = { 0 };
int i;
/* KEK derivation */
@@ -56,7 +56,7 @@ static int wrap_kh(const uint8_t *origin, const uint8_t *in,
}
static int individual_cert(const p256_int *d, const p256_int *pk_x,
- const p256_int *pk_y, uint8_t *cert, const int n)
+ const p256_int *pk_y, uint8_t *cert, const int n)
{
p256_int *serial;
@@ -75,15 +75,13 @@ int g2f_attestation_cert(uint8_t *buf)
return 0;
/* Note that max length is not currently respected here. */
- return individual_cert(&d, &pk_x, &pk_y,
- buf, G2F_ATTESTATION_CERT_MAX_LEN);
+ return individual_cert(&d, &pk_x, &pk_y, buf,
+ G2F_ATTESTATION_CERT_MAX_LEN);
}
/* U2F GENERATE command */
-static enum vendor_cmd_rc u2f_generate(enum vendor_cmd_cc code,
- void *buf,
- size_t input_size,
- size_t *response_size)
+static enum vendor_cmd_rc u2f_generate(enum vendor_cmd_cc code, void *buf,
+ size_t input_size, size_t *response_size)
{
U2F_GENERATE_REQ *req = buf;
U2F_GENERATE_RESP *resp;
@@ -149,7 +147,8 @@ static enum vendor_cmd_rc u2f_generate(enum vendor_cmd_cc code,
DECLARE_VENDOR_COMMAND(VENDOR_CC_U2F_GENERATE, u2f_generate);
static int verify_kh_pubkey(const uint8_t *key_handle,
- const U2F_EC_POINT *public_key, int *matches) {
+ const U2F_EC_POINT *public_key, int *matches)
+{
int rc;
U2F_EC_POINT kh_pubkey;
p256_int od, opk_x, opk_y;
@@ -163,8 +162,8 @@ static int verify_kh_pubkey(const uint8_t *key_handle,
p256_to_bin(&opk_y, kh_pubkey.y);
kh_pubkey.pointFormat = U2F_POINT_UNCOMPRESSED;
- *matches =
- safe_memcmp(&kh_pubkey, public_key, sizeof(U2F_EC_POINT)) == 0;
+ *matches = safe_memcmp(&kh_pubkey, public_key, sizeof(U2F_EC_POINT)) ==
+ 0;
return EC_SUCCESS;
}
@@ -216,10 +215,8 @@ static int verify_legacy_kh_owned(const uint8_t *app_id,
BUILD_ASSERT(sizeof(U2F_SIGN_RESP) <= sizeof(U2F_SIGN_REQ));
/* U2F SIGN command */
-static enum vendor_cmd_rc u2f_sign(enum vendor_cmd_cc code,
- void *buf,
- size_t input_size,
- size_t *response_size)
+static enum vendor_cmd_rc u2f_sign(enum vendor_cmd_cc code, void *buf,
+ size_t input_size, size_t *response_size)
{
const U2F_SIGN_REQ *req = buf;
U2F_SIGN_RESP *resp;
@@ -322,7 +319,7 @@ static inline int u2f_attest_verify_reg_resp(const uint8_t *user_secret,
uint8_t data_size,
const uint8_t *data)
{
- struct G2F_REGISTER_MSG *msg = (void *) data;
+ struct G2F_REGISTER_MSG *msg = (void *)data;
int verified;
if (data_size != sizeof(struct G2F_REGISTER_MSG))
@@ -348,10 +345,8 @@ static inline int u2f_attest_verify_reg_resp(const uint8_t *user_secret,
return VENDOR_RC_SUCCESS;
}
-static int u2f_attest_verify(const uint8_t *user_secret,
- uint8_t format,
- uint8_t data_size,
- const uint8_t *data)
+static int u2f_attest_verify(const uint8_t *user_secret, uint8_t format,
+ uint8_t data_size, const uint8_t *data)
{
switch (format) {
case U2F_ATTEST_FORMAT_REG_RESP:
@@ -372,10 +367,8 @@ static inline size_t u2f_attest_format_size(uint8_t format)
}
/* U2F ATTEST command */
-static enum vendor_cmd_rc u2f_attest(enum vendor_cmd_cc code,
- void *buf,
- size_t input_size,
- size_t *response_size)
+static enum vendor_cmd_rc u2f_attest(enum vendor_cmd_cc code, void *buf,
+ size_t input_size, size_t *response_size)
{
const U2F_ATTEST_REQ *req = buf;
U2F_ATTEST_RESP *resp;
@@ -401,10 +394,8 @@ static enum vendor_cmd_rc u2f_attest(enum vendor_cmd_cc code,
response_buf_size < sizeof(*resp))
return VENDOR_RC_BOGUS_ARGS;
- verify_ret = u2f_attest_verify(req->userSecret,
- req->format,
- req->dataLen,
- req->data);
+ verify_ret = u2f_attest_verify(req->userSecret, req->format,
+ req->dataLen, req->data);
if (verify_ret != VENDOR_RC_SUCCESS)
return verify_ret;