@@ -42,11 +42,11 @@ mod ct;
42
42
pub use hmac:: digest:: array:: typenum:: consts;
43
43
44
44
use hmac:: {
45
- SimpleHmac ,
45
+ SimpleHmacReset ,
46
46
digest:: {
47
47
Digest , FixedOutput , FixedOutputReset , KeyInit , Mac ,
48
48
array:: { Array , ArraySize } ,
49
- core_api :: BlockSizeUser ,
49
+ block_api :: BlockSizeUser ,
50
50
} ,
51
51
} ;
52
52
@@ -124,7 +124,7 @@ where
124
124
D : Digest + BlockSizeUser + FixedOutputReset ,
125
125
{
126
126
/// HMAC key `K` (see RFC 6979 Section 3.2.c)
127
- k : SimpleHmac < D > ,
127
+ k : SimpleHmacReset < D > ,
128
128
129
129
/// Chaining value `V` (see RFC 6979 Section 3.2.c)
130
130
v : Array < u8 , D :: OutputSize > ,
@@ -136,7 +136,7 @@ where
136
136
{
137
137
/// Initialize `HMAC_DRBG`
138
138
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 ( ) ) ;
140
140
let mut v = Array :: default ( ) ;
141
141
142
142
for b in & mut v {
@@ -149,7 +149,7 @@ where
149
149
k. update ( entropy_input) ;
150
150
k. update ( nonce) ;
151
151
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" ) ;
153
153
154
154
// Steps 3.2.e,g: v = HMAC_k(v)
155
155
k. update ( & v) ;
@@ -178,8 +178,8 @@ where
178
178
179
179
self . k . update ( & self . v ) ;
180
180
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" ) ;
183
183
self . k . update ( & self . v ) ;
184
184
self . v = self . k . finalize_reset ( ) . into_bytes ( ) ;
185
185
}
0 commit comments