diff --git a/Makefile b/Makefile index a35497e..cce8433 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ all: verify assert register +format: + clang-format -i verify.c assert.c register.c + verify: verify.c gcc -g -Wall -Werror -Wextra -lcrypto verify.c -o verify diff --git a/assert.c b/assert.c index 3b69053..6079050 100644 --- a/assert.c +++ b/assert.c @@ -1,29 +1,34 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Copyright: Jookia 2021 */ -#include #include #include #include +#include unsigned char cred_id[96]; -unsigned char cd_hash[] = { - 0xc0, 0x9e, 0xfa, 0x40, 0x30, 0x66, 0x31, 0xbd, 0xd9, 0x3a, 0xcf, 0xbd, - 0xab, 0x8d, 0x63, 0xc4, 0x0c, 0x99, 0x43, 0x43, 0xe4, 0x13, 0x85, 0x20, - 0xe2, 0x59, 0x2d, 0x41, 0xe9, 0xa0, 0xdd, 0xb1 -}; +unsigned char cd_hash[] = {0xc0, 0x9e, 0xfa, 0x40, 0x30, 0x66, 0x31, 0xbd, + 0xd9, 0x3a, 0xcf, 0xbd, 0xab, 0x8d, 0x63, 0xc4, + 0x0c, 0x99, 0x43, 0x43, 0xe4, 0x13, 0x85, 0x20, + 0xe2, 0x59, 0x2d, 0x41, 0xe9, 0xa0, 0xdd, 0xb1}; unsigned int cd_hash_len = 32; #define MAX_FIDO_DEVICES 8 -#define FIDO_CHECK(x) do { int err = x; if(err != FIDO_OK) { printf("FIDO ERR %i line %i\n", err, __LINE__); } } while(0) +#define FIDO_CHECK(x) \ + do { \ + int err = x; \ + if (err != FIDO_OK) { \ + printf("FIDO ERR %i line %i\n", err, __LINE__); \ + } \ + } while (0) int main(void) { printf("SigningTool assert\n"); fido_init(FIDO_DEBUG); printf("Reading cred_id\n"); - FILE* file = fopen("cred_id.bin", "r"); + FILE *file = fopen("cred_id.bin", "r"); FIDO_CHECK(!file); size_t cred_id_len = fread(cred_id, 1, sizeof(cred_id), file); FIDO_CHECK(!cred_id_len); @@ -35,7 +40,7 @@ FIDO_CHECK(fido_dev_info_manifest(devs, MAX_FIDO_DEVICES, &found)); printf("Found %zu devices\n", found); const char *path; - for(size_t i = 0; i < found; ++i) { + for (size_t i = 0; i < found; ++i) { fido_dev_info_t const *dev_info = fido_dev_info_ptr(devs, i); FIDO_CHECK(!dev_info); path = fido_dev_info_path(dev_info); @@ -47,7 +52,7 @@ FIDO_CHECK(fido_dev_open(dev, path)); fido_dev_info_free(&devs, MAX_FIDO_DEVICES); printf("Making assertion\n"); - fido_assert_t* assert = fido_assert_new(); + fido_assert_t *assert = fido_assert_new(); FIDO_CHECK(!assert); FIDO_CHECK(fido_assert_set_rp(assert, "id")); FIDO_CHECK(fido_assert_set_clientdata_hash(assert, cd_hash, cd_hash_len)); diff --git a/register.c b/register.c index 447e2cb..2a33bd6 100644 --- a/register.c +++ b/register.c @@ -1,28 +1,33 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Copyright: Jookia 2021 */ -#include #include #include #include #include +#include -unsigned char my_user_id[] = { - 0x15, 0xf9, 0x5d, 0x3e, 0xce, 0xe9, 0x17, 0x3e, 0x25, 0x8e, 0xe6, 0x20, - 0x92, 0xcf, 0xff, 0x9b, 0xe0, 0xcf, 0xf9, 0xca, 0x50, 0x8d, 0x1f, 0x24, - 0xf1, 0xa7, 0xeb, 0x68, 0x7d, 0xb7, 0x82, 0x5d -}; +unsigned char my_user_id[] = {0x15, 0xf9, 0x5d, 0x3e, 0xce, 0xe9, 0x17, 0x3e, + 0x25, 0x8e, 0xe6, 0x20, 0x92, 0xcf, 0xff, 0x9b, + 0xe0, 0xcf, 0xf9, 0xca, 0x50, 0x8d, 0x1f, 0x24, + 0xf1, 0xa7, 0xeb, 0x68, 0x7d, 0xb7, 0x82, 0x5d}; unsigned int my_user_id_len = 32; -unsigned char cd_hash[] = { - 0xc0, 0x9e, 0xfa, 0x40, 0x30, 0x66, 0x31, 0xbd, 0xd9, 0x3a, 0xcf, 0xbd, - 0xab, 0x8d, 0x63, 0xc4, 0x0c, 0x99, 0x43, 0x43, 0xe4, 0x13, 0x85, 0x20, - 0xe2, 0x59, 0x2d, 0x41, 0xe9, 0xa0, 0xdd, 0xb1 -}; +unsigned char cd_hash[] = {0xc0, 0x9e, 0xfa, 0x40, 0x30, 0x66, 0x31, 0xbd, + 0xd9, 0x3a, 0xcf, 0xbd, 0xab, 0x8d, 0x63, 0xc4, + 0x0c, 0x99, 0x43, 0x43, 0xe4, 0x13, 0x85, 0x20, + 0xe2, 0x59, 0x2d, 0x41, 0xe9, 0xa0, 0xdd, 0xb1}; unsigned int cd_hash_len = 32; #define MAX_FIDO_DEVICES 8 -#define FIDO_CHECK(x) do { int err = x; if(err != FIDO_OK) { printf("FIDO ERR %i %s line %i\n", err, fido_strerr(err), __LINE__); exit(1); } } while(0) +#define FIDO_CHECK(x) \ + do { \ + int err = x; \ + if (err != FIDO_OK) { \ + printf("FIDO ERR %i %s line %i\n", err, fido_strerr(err), __LINE__); \ + exit(1); \ + } \ + } while (0) int main(void) { printf("SigningTool register\n"); @@ -34,7 +39,7 @@ FIDO_CHECK(fido_dev_info_manifest(devs, MAX_FIDO_DEVICES, &found)); printf("Found %zu devices\n", found); const char *path; - for(size_t i = 0; i < found; ++i) { + for (size_t i = 0; i < found; ++i) { fido_dev_info_t const *dev_info = fido_dev_info_ptr(devs, i); FIDO_CHECK(!dev_info); path = fido_dev_info_path(dev_info); @@ -48,11 +53,13 @@ printf("Forcing U2F\n"); fido_dev_force_u2f(dev); printf("Making credential\n"); - fido_cred_t* cred = fido_cred_new(); + fido_cred_t *cred = fido_cred_new(); FIDO_CHECK(!cred); - FIDO_CHECK(fido_cred_set_type(cred, COSE_ES256)); /* COSE_ES256, COSE_RS256, COSE_EDDSA */ + FIDO_CHECK(fido_cred_set_type( + cred, COSE_ES256)); /* COSE_ES256, COSE_RS256, COSE_EDDSA */ FIDO_CHECK(fido_cred_set_clientdata_hash(cred, cd_hash, cd_hash_len)); - FIDO_CHECK(fido_cred_set_user(cred, my_user_id, my_user_id_len, NULL, NULL, NULL)); + FIDO_CHECK( + fido_cred_set_user(cred, my_user_id, my_user_id_len, NULL, NULL, NULL)); FIDO_CHECK(fido_cred_set_rp(cred, "id", "name")); FIDO_CHECK(fido_cred_set_fmt(cred, "packed")); printf("Generating credential\n"); diff --git a/verify.c b/verify.c index 92fd9f5..e429f75 100644 --- a/verify.c +++ b/verify.c @@ -1,16 +1,21 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Copyright: Jookia 2021 */ -#include +#include #include #include -#include unsigned char authdata[4096]; unsigned char clienthash[4096]; unsigned char signature[4096]; -#define MY_ASSERT(x) do { int err = (long int)x; if(err == 0) { printf("ERR %i line %i\n", err, __LINE__); } } while(0) +#define MY_ASSERT(x) \ + do { \ + int err = (long int)x; \ + if (err == 0) { \ + printf("ERR %i line %i\n", err, __LINE__); \ + } \ + } while (0) int main(void) { printf("SigningTool verify\n");