@@ -42,11 +42,11 @@ mod ct;
4242pub use hmac:: digest:: array:: typenum:: consts;
4343
4444use hmac:: {
45- SimpleHmac ,
45+ SimpleHmacReset ,
4646 digest:: {
4747 Digest , FixedOutput , FixedOutputReset , KeyInit , Mac ,
4848 array:: { Array , ArraySize } ,
49- core_api :: BlockSizeUser ,
49+ block_api :: BlockSizeUser ,
5050 } ,
5151} ;
5252
@@ -124,7 +124,7 @@ where
124124 D : Digest + BlockSizeUser + FixedOutputReset ,
125125{
126126 /// HMAC key `K` (see RFC 6979 Section 3.2.c)
127- k : SimpleHmac < D > ,
127+ k : SimpleHmacReset < D > ,
128128
129129 /// Chaining value `V` (see RFC 6979 Section 3.2.c)
130130 v : Array < u8 , D :: OutputSize > ,
@@ -136,7 +136,7 @@ where
136136{
137137 /// Initialize `HMAC_DRBG`
138138 pub fn new ( entropy_input : & [ u8 ] , nonce : & [ u8 ] , personalization_string : & [ u8 ] ) -> Self {
139- let mut k = SimpleHmac :: new ( & Default :: default ( ) ) ;
139+ let mut k = SimpleHmacReset :: new ( & Default :: default ( ) ) ;
140140 let mut v = Array :: default ( ) ;
141141
142142 for b in & mut v {
@@ -149,7 +149,7 @@ where
149149 k. update ( entropy_input) ;
150150 k. update ( nonce) ;
151151 k. update ( personalization_string) ;
152- k = SimpleHmac :: new_from_slice ( & k. finalize ( ) . into_bytes ( ) ) . expect ( "HMAC error" ) ;
152+ k = SimpleHmacReset :: new_from_slice ( & k. finalize ( ) . into_bytes ( ) ) . expect ( "HMAC error" ) ;
153153
154154 // Steps 3.2.e,g: v = HMAC_k(v)
155155 k. update ( & v) ;
@@ -178,8 +178,8 @@ where
178178
179179 self . k . update ( & self . v ) ;
180180 self . k . update ( & [ 0x00 ] ) ;
181- self . k =
182- SimpleHmac :: new_from_slice ( & self . k . finalize_reset ( ) . into_bytes ( ) ) . expect ( "HMAC error" ) ;
181+ self . k = SimpleHmacReset :: new_from_slice ( & self . k . finalize_reset ( ) . into_bytes ( ) )
182+ . expect ( "HMAC error" ) ;
183183 self . k . update ( & self . v ) ;
184184 self . v = self . k . finalize_reset ( ) . into_bytes ( ) ;
185185 }
0 commit comments