Merge remote-tracking branch 'benma/nottwice'

benma · benma · commit caa2a1c37c3b · 2023-04-17T21:56:09.000+02:00
diff --git a/src/keystore.c b/src/keystore.c
@@ -564,7 +564,7 @@ bool keystore_secp256k1_nonce_commit(
     uint8_t* signer_commitment_out)
 {
     struct ext_key xprv __attribute__((__cleanup__(keystore_zero_xkey))) = {0};
-    if (!_get_xprv_twice(keypath, keypath_len, &xprv)) {
+    if (!_get_xprv(keypath, keypath_len, &xprv)) {
         return false;
     }
     const secp256k1_context* ctx = wally_get_secp_context();
@@ -596,7 +596,7 @@ bool keystore_secp256k1_sign(
         return false;
     }
     struct ext_key xprv __attribute__((__cleanup__(keystore_zero_xkey))) = {0};
-    if (!_get_xprv_twice(keypath, keypath_len, &xprv)) {
+    if (!_get_xprv(keypath, keypath_len, &xprv)) {
         return false;
     }
     const secp256k1_context* ctx = wally_get_secp_context();
@@ -731,7 +731,7 @@ static bool _schnorr_bip86_keypair(
         return false;
     }
     struct ext_key xprv __attribute__((__cleanup__(keystore_zero_xkey))) = {0};
-    if (!_get_xprv_twice(keypath, keypath_len, &xprv)) {
+    if (!_get_xprv(keypath, keypath_len, &xprv)) {
         return false;
     }
     const uint8_t* secret_key = xprv.priv_key + 1; // first byte is 0;

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ bool keystore_secp256k1_nonce_commit(`
`564`	`564`	`uint8_t* signer_commitment_out)`
`565`	`565`	`{`
`566`	`566`	`struct ext_key xprv __attribute__((__cleanup__(keystore_zero_xkey))) = {0};`
`567`		`- if (!_get_xprv_twice(keypath, keypath_len, &xprv)) {`
	`567`	`+ if (!_get_xprv(keypath, keypath_len, &xprv)) {`
`568`	`568`	`return false;`
`569`	`569`	`}`
`570`	`570`	`const secp256k1_context* ctx = wally_get_secp_context();`
`@@ -596,7 +596,7 @@ bool keystore_secp256k1_sign(`
`596`	`596`	`return false;`
`597`	`597`	`}`
`598`	`598`	`struct ext_key xprv __attribute__((__cleanup__(keystore_zero_xkey))) = {0};`
`599`		`- if (!_get_xprv_twice(keypath, keypath_len, &xprv)) {`
	`599`	`+ if (!_get_xprv(keypath, keypath_len, &xprv)) {`
`600`	`600`	`return false;`
`601`	`601`	`}`
`602`	`602`	`const secp256k1_context* ctx = wally_get_secp_context();`
`@@ -731,7 +731,7 @@ static bool _schnorr_bip86_keypair(`
`731`	`731`	`return false;`
`732`	`732`	`}`
`733`	`733`	`struct ext_key xprv __attribute__((__cleanup__(keystore_zero_xkey))) = {0};`
`734`		`- if (!_get_xprv_twice(keypath, keypath_len, &xprv)) {`
	`734`	`+ if (!_get_xprv(keypath, keypath_len, &xprv)) {`
`735`	`735`	`return false;`
`736`	`736`	`}`
`737`	`737`	`const uint8_t* secret_key = xprv.priv_key + 1; // first byte is 0;`