arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-21 23:18:13 +00:00
Code Issues Releases Wiki Activity

refactor(crypto): propagate error from zkp_context_acquire_writable()

Browse Source
This commit is contained in:
Ondřej Vejpustek 2021-10-20 15:34:18 +02:00
parent 29ce860d46
commit 273d6d14cc
3 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crypto/zkp_bip340.c
View File

@ -44,12 +44,16 @@ int zkp_bip340_get_public_key(const uint8_t *private_key_bytes,
if (result == 0) {
secp256k1_context *context_writable = zkp_context_acquire_writable();
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_ec_pubkey_create(context_writable, &pubkey,
private_key_bytes) != 1) {
if (context_writable) {
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_ec_pubkey_create(context_writable, &pubkey,
private_key_bytes) != 1) {
result = -1;
}
zkp_context_release_writable();
} else {
result = -1;
}
zkp_context_release_writable();
}
secp256k1_xonly_pubkey xonly_pubkey = {0};
@ -91,22 +95,30 @@ int zkp_bip340_sign_digest(const uint8_t *private_key_bytes,
if (result == 0) {
secp256k1_context *context_writable = zkp_context_acquire_writable();
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_keypair_create(context_writable, &keypair,
private_key_bytes) != 1) {
if (context_writable) {
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_keypair_create(context_writable, &keypair,
private_key_bytes) != 1) {
result = -1;
}
zkp_context_release_writable();
} else {
result = -1;
}
zkp_context_release_writable();
}
if (result == 0) {
secp256k1_context *context_writable = zkp_context_acquire_writable();
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_schnorrsig_sign(context_writable, signature_bytes, digest,
&keypair, NULL, auxiliary_data) != 1) {
if (context_writable) {
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_schnorrsig_sign(context_writable, signature_bytes, digest,
&keypair, NULL, auxiliary_data) != 1) {
result = -1;
}
zkp_context_release_writable();
} else {
result = -1;
}
zkp_context_release_writable();
}
memzero(&keypair, sizeof(keypair));

6
crypto/zkp_context.c
View File

@ -81,11 +81,15 @@ const secp256k1_context *zkp_context_get_read_only() {
return context;
}
// returns NULL if context cannot be acquired
secp256k1_context *zkp_context_acquire_writable() {
assert(initialized == true);
// We don't expect the context to be used by multiple threads
assert(!atomic_flag_test_and_set(&locked));
if (atomic_flag_test_and_set(&locked)) {
return NULL;
}
return context;
}

40
crypto/zkp_ecdsa.c
View File

@ -55,12 +55,16 @@ int zkp_ecdsa_get_public_key33(const ecdsa_curve *curve,
if (result == 0) {
secp256k1_context *context_writable = zkp_context_acquire_writable();
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_ec_pubkey_create(context_writable, &public_key,
private_key_bytes) != 1) {
if (context_writable) {
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_ec_pubkey_create(context_writable, &public_key,
private_key_bytes) != 1) {
result = 1;
}
zkp_context_release_writable();
} else {
result = 1;
}
zkp_context_release_writable();
}
if (result == 0) {
@ -94,12 +98,16 @@ int zkp_ecdsa_get_public_key65(const ecdsa_curve *curve,
if (result == 0) {
secp256k1_context *context_writable = zkp_context_acquire_writable();
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_ec_pubkey_create(context_writable, &public_key,
private_key_bytes) != 1) {
if (context_writable) {
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_ec_pubkey_create(context_writable, &public_key,
private_key_bytes) != 1) {
result = 1;
}
zkp_context_release_writable();
} else {
result = 1;
}
zkp_context_release_writable();
}
if (result == 0) {
@ -147,14 +155,18 @@ int zkp_ecdsa_sign_digest(
secp256k1_ecdsa_recoverable_signature recoverable_signature = {0};
if (result == 0) {
secp256k1_context *ctx_writable = zkp_context_acquire_writable();
secp256k1_context_writable_randomize(ctx_writable);
if (secp256k1_ecdsa_sign_recoverable(ctx_writable, &recoverable_signature,
digest, private_key_bytes, NULL,
NULL) != 1) {
secp256k1_context *context_writable = zkp_context_acquire_writable();
if (context_writable) {
secp256k1_context_writable_randomize(context_writable);
if (secp256k1_ecdsa_sign_recoverable(
context_writable, &recoverable_signature, digest,
private_key_bytes, NULL, NULL) != 1) {
result = 1;
}
zkp_context_release_writable();
} else {
result = 1;
}
zkp_context_release_writable();
}
if (result == 0) {