arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 06:18:07 +00:00
Code Issues Releases Wiki Activity

Added curve type to HDNode

Browse Source 
Every curve gets it's own hierarchy and the curve is remembered in
HD node.  Fixed the private/public key derivations to use the right
modulus.
This commit is contained in:
Jochen Hoenicke 2016-04-19 18:21:56 +02:00
parent f4dd151eb9
commit c983afd72f
6 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bip32.c
View File

@ -34,9 +34,7 @@
#include "macros.h" #include "macros.h"
#include "secp256k1.h" #include "secp256k1.h"
static const ecdsa_curve *default_curve = &secp256k1; int hdnode_from_xpub(uint32_t depth, uint32_t fingerprint, uint32_t child_num, const uint8_t *chain_code, const uint8_t *public_key, const char* curve, HDNode *out)
int hdnode_from_xpub(uint32_t depth, uint32_t fingerprint, uint32_t child_num, const uint8_t *chain_code, const uint8_t *public_key, HDNode *out)
{ {
if (public_key[0] != 0x02 && public_key[0] != 0x03) { // invalid pubkey if (public_key[0] != 0x02 && public_key[0] != 0x03) { // invalid pubkey
return 0; return 0;
@ -47,19 +45,21 @@ int hdnode_from_xpub(uint32_t depth, uint32_t fingerprint, uint32_t child_num, c
memcpy(out->chain_code, chain_code, 32); memcpy(out->chain_code, chain_code, 32);
MEMSET_BZERO(out->private_key, 32); MEMSET_BZERO(out->private_key, 32);
memcpy(out->public_key, public_key, 33); memcpy(out->public_key, public_key, 33);
out->curve = get_curve_by_name(curve);
return 1; return 1;
} }
int hdnode_from_xprv(uint32_t depth, uint32_t fingerprint, uint32_t child_num, const uint8_t *chain_code, const uint8_t *private_key, HDNode *out) int hdnode_from_xprv(uint32_t depth, uint32_t fingerprint, uint32_t child_num, const uint8_t *chain_code, const uint8_t *private_key, const char* curve, HDNode *out)
{ {
bignum256 a; bignum256 a;
bn_read_be(private_key, &a); bn_read_be(private_key, &a);
out->curve = get_curve_by_name(curve);
bool failed = false; bool failed = false;
if (bn_is_zero(&a)) { // == 0 if (bn_is_zero(&a)) { // == 0
failed = true; failed = true;
} else { } else {
if (!bn_is_less(&a, &default_curve->order)) { // >= order if (!bn_is_less(&a, &out->curve->order)) { // >= order
failed = true; failed = true;
} }
MEMSET_BZERO(&a, sizeof(a)); MEMSET_BZERO(&a, sizeof(a));
@ -78,13 +78,14 @@ int hdnode_from_xprv(uint32_t depth, uint32_t fingerprint, uint32_t child_num, c
return 1; return 1;
} }
int hdnode_from_seed(const uint8_t *seed, int seed_len, HDNode *out) int hdnode_from_seed(const uint8_t *seed, int seed_len, const char* curve, HDNode *out)
{ {
uint8_t I[32 + 32]; uint8_t I[32 + 32];
memset(out, 0, sizeof(HDNode)); memset(out, 0, sizeof(HDNode));
out->depth = 0; out->depth = 0;
out->fingerprint = 0x00000000; out->fingerprint = 0x00000000;
out->child_num = 0; out->child_num = 0;
out->curve = get_curve_by_name(curve);
hmac_sha512((uint8_t *)"Bitcoin seed", 12, seed, seed_len, I); hmac_sha512((uint8_t *)"Bitcoin seed", 12, seed, seed_len, I);
memcpy(out->private_key, I, 32); memcpy(out->private_key, I, 32);
bignum256 a; bignum256 a;
@ -94,7 +95,7 @@ int hdnode_from_seed(const uint8_t *seed, int seed_len, HDNode *out)
if (bn_is_zero(&a)) { // == 0 if (bn_is_zero(&a)) { // == 0
failed = true; failed = true;
} else { } else {
if (!bn_is_less(&a, &default_curve->order)) { // >= order if (!bn_is_less(&a, &out->curve->order)) { // >= order
failed = true; failed = true;
} }
MEMSET_BZERO(&a, sizeof(a)); MEMSET_BZERO(&a, sizeof(a));
@ -138,12 +139,12 @@ int hdnode_private_ckd(HDNode *inout, uint32_t i)
bool failed = false; bool failed = false;
if (!bn_is_less(&b, &default_curve->order)) { // >= order if (!bn_is_less(&b, &inout->curve->order)) { // >= order
failed = true; failed = true;
} }
if (!failed) { if (!failed) {
bn_addmod(&a, &b, &default_curve->order); bn_addmod(&a, &b, &inout->curve->order);
bn_mod(&a, &default_curve->order); bn_mod(&a, &inout->curve->order);
if (bn_is_zero(&a)) { if (bn_is_zero(&a)) {
failed = true; failed = true;
} }
@ -186,7 +187,7 @@ int hdnode_public_ckd(HDNode *inout, uint32_t i)
memset(inout->private_key, 0, 32); memset(inout->private_key, 0, 32);
bool failed = false; bool failed = false;
if (!ecdsa_read_pubkey(default_curve, inout->public_key, &a)) { if (!ecdsa_read_pubkey(inout->curve, inout->public_key, &a)) {
failed = true; failed = true;
} }
@ -194,15 +195,15 @@ int hdnode_public_ckd(HDNode *inout, uint32_t i)
hmac_sha512(inout->chain_code, 32, data, sizeof(data), I); hmac_sha512(inout->chain_code, 32, data, sizeof(data), I);
memcpy(inout->chain_code, I + 32, 32); memcpy(inout->chain_code, I + 32, 32);
bn_read_be(I, &c); bn_read_be(I, &c);
if (!bn_is_less(&c, &default_curve->order)) { // >= order if (!bn_is_less(&c, &inout->curve->order)) { // >= order
failed = true; failed = true;
} }
} }
if (!failed) { if (!failed) {
scalar_multiply(default_curve, &c, &b); // b = c * G scalar_multiply(inout->curve, &c, &b); // b = c * G
point_add(default_curve, &a, &b); // b = a + b point_add(inout->curve, &a, &b); // b = a + b
if (!ecdsa_validate_pubkey(default_curve, &b)) { if (!ecdsa_validate_pubkey(inout->curve, &b)) {
failed = true; failed = true;
} }
} }
@ -263,7 +264,8 @@ int hdnode_private_ckd_cached(HDNode *inout, const uint32_t *i, size_t i_count)
for (j = 0; j < BIP32_CACHE_SIZE; j++) { for (j = 0; j < BIP32_CACHE_SIZE; j++) {
if (private_ckd_cache[j].set && if (private_ckd_cache[j].set &&
private_ckd_cache[j].depth == i_count - 1 && private_ckd_cache[j].depth == i_count - 1 &&
memcmp(private_ckd_cache[j].i, i, (i_count - 1) * sizeof(uint32_t)) == 0) { memcmp(private_ckd_cache[j].i, i, (i_count - 1) * sizeof(uint32_t)) == 0 &&
private_ckd_cache[j].node.curve == inout->curve) {
memcpy(inout, &(private_ckd_cache[j].node), sizeof(HDNode)); memcpy(inout, &(private_ckd_cache[j].node), sizeof(HDNode));
found = true; found = true;
break; break;
@ -295,7 +297,7 @@ int hdnode_private_ckd_cached(HDNode *inout, const uint32_t *i, size_t i_count)
void hdnode_fill_public_key(HDNode *node) void hdnode_fill_public_key(HDNode *node)
{ {
ecdsa_get_public_key33(default_curve, node->private_key, node->public_key); ecdsa_get_public_key33(node->curve, node->private_key, node->public_key);
} }
void hdnode_serialize(const HDNode *node, uint32_t version, char use_public, char *str, int strsize) void hdnode_serialize(const HDNode *node, uint32_t version, char use_public, char *str, int strsize)

7
bip32.h
View File

@ -36,13 +36,14 @@ typedef struct {
uint8_t chain_code[32]; uint8_t chain_code[32];
uint8_t private_key[32]; uint8_t private_key[32];
uint8_t public_key[33]; uint8_t public_key[33];
const ecdsa_curve *curve;
} HDNode; } HDNode;
int hdnode_from_xpub(uint32_t depth, uint32_t fingerprint, uint32_t child_num, const uint8_t *chain_code, const uint8_t *public_key, HDNode *out); int hdnode_from_xpub(uint32_t depth, uint32_t fingerprint, uint32_t child_num, const uint8_t *chain_code, const uint8_t *public_key, const char *curve, HDNode *out);
int hdnode_from_xprv(uint32_t depth, uint32_t fingerprint, uint32_t child_num, const uint8_t *chain_code, const uint8_t *private_key, HDNode *out); int hdnode_from_xprv(uint32_t depth, uint32_t fingerprint, uint32_t child_num, const uint8_t *chain_code, const uint8_t *private_key, const char *curve, HDNode *out);
int hdnode_from_seed(const uint8_t *seed, int seed_len, HDNode *out); int hdnode_from_seed(const uint8_t *seed, int seed_len, const char *curve, HDNode *out);
#define hdnode_private_ckd_prime(X, I) hdnode_private_ckd((X), ((I) | 0x80000000)) #define hdnode_private_ckd_prime(X, I) hdnode_private_ckd((X), ((I) | 0x80000000))

1
nist256p1.c
View File

@ -23,6 +23,7 @@
#include "nist256p1.h" #include "nist256p1.h"
const char NIST256P1_NAME[] = "nist256p1";
const ecdsa_curve nist256p1 = { const ecdsa_curve nist256p1 = {
/* .prime */ { /* .prime */ {
/*.val =*/ {0x3fffffff, 0x3fffffff, 0x3fffffff, 0x3f, 0x0, 0x0, 0x1000, 0x3fffc000, 0xffff} /*.val =*/ {0x3fffffff, 0x3fffffff, 0x3fffffff, 0x3f, 0x0, 0x0, 0x1000, 0x3fffc000, 0xffff}

1
nist256p1.h
View File

@ -28,6 +28,7 @@
#include "ecdsa.h" #include "ecdsa.h"
extern const char NIST256P1_NAME[];
extern const ecdsa_curve nist256p1; extern const ecdsa_curve nist256p1;
#endif #endif

2
secp256k1.c
View File

@ -23,6 +23,8 @@
#include "secp256k1.h" #include "secp256k1.h"
const char SECP256K1_NAME[] = "secp256k1";
const ecdsa_curve secp256k1 = { const ecdsa_curve secp256k1 = {
/* .prime */ { /* .prime */ {
/*.val =*/ {0x3ffffc2f, 0x3ffffffb, 0x3fffffff, 0x3fffffff, 0x3fffffff, 0x3fffffff, 0x3fffffff, 0x3fffffff, 0xffff} /*.val =*/ {0x3ffffc2f, 0x3ffffffb, 0x3fffffff, 0x3fffffff, 0x3fffffff, 0x3fffffff, 0x3fffffff, 0x3fffffff, 0xffff}

1
secp256k1.h
View File

@ -28,6 +28,7 @@
#include "ecdsa.h" #include "ecdsa.h"
extern const char SECP256K1_NAME[];
extern const ecdsa_curve secp256k1; extern const ecdsa_curve secp256k1;
#endif #endif