1
- use bitcoin:: hashes:: { Hash , HashEngine } ;
2
1
use bitcoin:: hashes:: hmac:: { Hmac , HmacEngine } ;
3
2
use bitcoin:: hashes:: sha256:: Hash as Sha256 ;
4
- use bitcoin:: secp256k1:: { Message , Secp256k1 , SecretKey , ecdsa:: Signature , Signing } ;
3
+ use bitcoin:: hashes:: { Hash , HashEngine } ;
4
+ use bitcoin:: secp256k1:: { ecdsa:: Signature , Message , Secp256k1 , SecretKey , Signing } ;
5
5
6
6
use crate :: sign:: EntropySource ;
7
7
@@ -43,14 +43,16 @@ macro_rules! hkdf_extract_expand {
43
43
let k5 = Hmac :: from_engine( hmac) . to_byte_array( ) ;
44
44
45
45
( k1, k2, k3, k4, k5)
46
- } }
46
+ } } ;
47
47
}
48
48
49
49
pub fn hkdf_extract_expand_twice ( salt : & [ u8 ] , ikm : & [ u8 ] ) -> ( [ u8 ; 32 ] , [ u8 ; 32 ] ) {
50
50
hkdf_extract_expand ! ( salt, ikm, 2 )
51
51
}
52
52
53
- pub fn hkdf_extract_expand_5x ( salt : & [ u8 ] , ikm : & [ u8 ] ) -> ( [ u8 ; 32 ] , [ u8 ; 32 ] , [ u8 ; 32 ] , [ u8 ; 32 ] , [ u8 ; 32 ] ) {
53
+ pub fn hkdf_extract_expand_5x (
54
+ salt : & [ u8 ] , ikm : & [ u8 ] ,
55
+ ) -> ( [ u8 ; 32 ] , [ u8 ; 32 ] , [ u8 ; 32 ] , [ u8 ; 32 ] , [ u8 ; 32 ] ) {
54
56
hkdf_extract_expand ! ( salt, ikm, 5 )
55
57
}
56
58
@@ -66,8 +68,11 @@ pub fn sign<C: Signing>(ctx: &Secp256k1<C>, msg: &Message, sk: &SecretKey) -> Si
66
68
#[ inline]
67
69
#[ allow( unused_variables) ]
68
70
pub fn sign_with_aux_rand < C : Signing , ES : Deref > (
69
- ctx : & Secp256k1 < C > , msg : & Message , sk : & SecretKey , entropy_source : & ES
70
- ) -> Signature where ES :: Target : EntropySource {
71
+ ctx : & Secp256k1 < C > , msg : & Message , sk : & SecretKey , entropy_source : & ES ,
72
+ ) -> Signature
73
+ where
74
+ ES :: Target : EntropySource ,
75
+ {
71
76
#[ cfg( feature = "grind_signatures" ) ]
72
77
let sig = loop {
73
78
let sig = ctx. sign_ecdsa_with_noncedata ( msg, sk, & entropy_source. get_secure_random_bytes ( ) ) ;
0 commit comments