1818// Block size for HMAC (64 bytes for SHA-1, SHA-256, SHA-512)
1919#define HMAC_BLOCK_SIZE 64
2020
21- PBKDF2_HMACBuilder::PBKDF2_HMACBuilder (HashBuilder* hash, String password, String salt, uint32_t iterations) {
21+ PBKDF2_HMACBuilder::PBKDF2_HMACBuilder (HashBuilder * hash, String password, String salt, uint32_t iterations) {
2222 this ->hashBuilder = hash;
2323 this ->hashSize = hashBuilder->getHashSize ();
2424 this ->iterations = iterations;
@@ -55,10 +55,10 @@ void PBKDF2_HMACBuilder::clearData() {
5555 calculated = false ;
5656}
5757
58- void PBKDF2_HMACBuilder::hmac (const uint8_t * key, size_t keyLen, const uint8_t * data, size_t dataLen, uint8_t * output) {
58+ void PBKDF2_HMACBuilder::hmac (const uint8_t * key, size_t keyLen, const uint8_t * data, size_t dataLen, uint8_t * output) {
5959 uint8_t keyPad[HMAC_BLOCK_SIZE];
6060 uint8_t outerPad[HMAC_BLOCK_SIZE];
61- uint8_t innerHash[64 ]; // Large enough for any hash
61+ uint8_t innerHash[64 ]; // Large enough for any hash
6262
6363 // Prepare key
6464 if (keyLen > HMAC_BLOCK_SIZE) {
@@ -166,7 +166,7 @@ String PBKDF2_HMACBuilder::toString() {
166166}
167167
168168// PBKDF2 specific methods
169- void PBKDF2_HMACBuilder::setPassword (const uint8_t * password, size_t len) {
169+ void PBKDF2_HMACBuilder::setPassword (const uint8_t * password, size_t len) {
170170 if (this ->password != nullptr ) {
171171 forced_memzero (this ->password , len);
172172 delete[] this ->password ;
@@ -177,15 +177,15 @@ void PBKDF2_HMACBuilder::setPassword(const uint8_t* password, size_t len) {
177177 calculated = false ;
178178}
179179
180- void PBKDF2_HMACBuilder::setPassword (const char * password) {
181- setPassword ((const uint8_t *)password, strlen (password));
180+ void PBKDF2_HMACBuilder::setPassword (const char * password) {
181+ setPassword ((const uint8_t *)password, strlen (password));
182182}
183183
184184void PBKDF2_HMACBuilder::setPassword (String password) {
185- setPassword ((const uint8_t *)password.c_str (), password.length ());
185+ setPassword ((const uint8_t *)password.c_str (), password.length ());
186186}
187187
188- void PBKDF2_HMACBuilder::setSalt (const uint8_t * salt, size_t len) {
188+ void PBKDF2_HMACBuilder::setSalt (const uint8_t * salt, size_t len) {
189189 if (this ->salt != nullptr ) {
190190 forced_memzero (this ->salt , len);
191191 delete[] this ->salt ;
@@ -196,32 +196,32 @@ void PBKDF2_HMACBuilder::setSalt(const uint8_t* salt, size_t len) {
196196 calculated = false ;
197197}
198198
199- void PBKDF2_HMACBuilder::setSalt (const char * salt) {
200- setSalt ((const uint8_t *)salt, strlen (salt));
199+ void PBKDF2_HMACBuilder::setSalt (const char * salt) {
200+ setSalt ((const uint8_t *)salt, strlen (salt));
201201}
202202
203203void PBKDF2_HMACBuilder::setSalt (String salt) {
204- setSalt ((const uint8_t *)salt.c_str (), salt.length ());
204+ setSalt ((const uint8_t *)salt.c_str (), salt.length ());
205205}
206206
207207void PBKDF2_HMACBuilder::setIterations (uint32_t iterations) {
208208 this ->iterations = iterations;
209209}
210210
211- void PBKDF2_HMACBuilder::setHashAlgorithm (HashBuilder* hash) {
211+ void PBKDF2_HMACBuilder::setHashAlgorithm (HashBuilder * hash) {
212212 // Set the hash algorithm to use for the HMAC
213213 // Note: We don't delete hashBuilder here as it might be owned by the caller
214214 // The caller is responsible for managing the hashBuilder lifetime
215215 hashBuilder = hash;
216216 hashSize = hashBuilder->getHashSize ();
217217}
218218
219- void PBKDF2_HMACBuilder::pbkdf2_hmac (const uint8_t * password, size_t passwordLen,
220- const uint8_t * salt , size_t saltLen,
221- uint32_t iterations, uint8_t * output, size_t outputLen ) {
222- uint8_t u1[64 ]; // Large enough for any hash
219+ void PBKDF2_HMACBuilder::pbkdf2_hmac (
220+ const uint8_t *password, size_t passwordLen, const uint8_t *salt, size_t saltLen, uint32_t iterations, uint8_t *output , size_t outputLen
221+ ) {
222+ uint8_t u1[64 ]; // Large enough for any hash
223223 uint8_t u2[64 ];
224- uint8_t saltWithBlock[256 ]; // Salt + block number
224+ uint8_t saltWithBlock[256 ]; // Salt + block number
225225 uint8_t block[64 ];
226226
227227 size_t blocks = (outputLen + hashSize - 1 ) / hashSize;
0 commit comments