mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-12-20 21:38:26 +00:00
make salt constant in pbkdf2
This commit is contained in:
parent
75f2396624
commit
51c0bb09d8
8
pbkdf2.c
8
pbkdf2.c
@ -26,7 +26,7 @@
|
|||||||
#include "hmac.h"
|
#include "hmac.h"
|
||||||
#include "macros.h"
|
#include "macros.h"
|
||||||
|
|
||||||
void pbkdf2_hmac_sha256_Init(PBKDF2_HMAC_SHA256_CTX *pctx, const uint8_t *pass, int passlen, uint8_t *salt, int saltlen)
|
void pbkdf2_hmac_sha256_Init(PBKDF2_HMAC_SHA256_CTX *pctx, const uint8_t *pass, int passlen, const uint8_t *salt, int saltlen)
|
||||||
{
|
{
|
||||||
HMAC_SHA256_CTX hctx;
|
HMAC_SHA256_CTX hctx;
|
||||||
hmac_sha256_Init(&hctx, pass, passlen);
|
hmac_sha256_Init(&hctx, pass, passlen);
|
||||||
@ -56,7 +56,7 @@ void pbkdf2_hmac_sha256_Final(PBKDF2_HMAC_SHA256_CTX *pctx, uint8_t *key)
|
|||||||
MEMSET_BZERO(pctx, sizeof(PBKDF2_HMAC_SHA256_CTX));
|
MEMSET_BZERO(pctx, sizeof(PBKDF2_HMAC_SHA256_CTX));
|
||||||
}
|
}
|
||||||
|
|
||||||
void pbkdf2_hmac_sha256(const uint8_t *pass, int passlen, uint8_t *salt, int saltlen, uint32_t iterations, uint8_t *key)
|
void pbkdf2_hmac_sha256(const uint8_t *pass, int passlen, const uint8_t *salt, int saltlen, uint32_t iterations, uint8_t *key)
|
||||||
{
|
{
|
||||||
PBKDF2_HMAC_SHA256_CTX pctx;
|
PBKDF2_HMAC_SHA256_CTX pctx;
|
||||||
pbkdf2_hmac_sha256_Init(&pctx, pass, passlen, salt, saltlen);
|
pbkdf2_hmac_sha256_Init(&pctx, pass, passlen, salt, saltlen);
|
||||||
@ -64,7 +64,7 @@ void pbkdf2_hmac_sha256(const uint8_t *pass, int passlen, uint8_t *salt, int sal
|
|||||||
pbkdf2_hmac_sha256_Final(&pctx, key);
|
pbkdf2_hmac_sha256_Final(&pctx, key);
|
||||||
}
|
}
|
||||||
|
|
||||||
void pbkdf2_hmac_sha512_Init(PBKDF2_HMAC_SHA512_CTX *pctx, const uint8_t *pass, int passlen, uint8_t *salt, int saltlen)
|
void pbkdf2_hmac_sha512_Init(PBKDF2_HMAC_SHA512_CTX *pctx, const uint8_t *pass, int passlen, const uint8_t *salt, int saltlen)
|
||||||
{
|
{
|
||||||
HMAC_SHA512_CTX hctx;
|
HMAC_SHA512_CTX hctx;
|
||||||
hmac_sha512_Init(&hctx, pass, passlen);
|
hmac_sha512_Init(&hctx, pass, passlen);
|
||||||
@ -94,7 +94,7 @@ void pbkdf2_hmac_sha512_Final(PBKDF2_HMAC_SHA512_CTX *pctx, uint8_t *key)
|
|||||||
MEMSET_BZERO(pctx, sizeof(PBKDF2_HMAC_SHA512_CTX));
|
MEMSET_BZERO(pctx, sizeof(PBKDF2_HMAC_SHA512_CTX));
|
||||||
}
|
}
|
||||||
|
|
||||||
void pbkdf2_hmac_sha512(const uint8_t *pass, int passlen, uint8_t *salt, int saltlen, uint32_t iterations, uint8_t *key)
|
void pbkdf2_hmac_sha512(const uint8_t *pass, int passlen, const uint8_t *salt, int saltlen, uint32_t iterations, uint8_t *key)
|
||||||
{
|
{
|
||||||
PBKDF2_HMAC_SHA512_CTX pctx;
|
PBKDF2_HMAC_SHA512_CTX pctx;
|
||||||
pbkdf2_hmac_sha512_Init(&pctx, pass, passlen, salt, saltlen);
|
pbkdf2_hmac_sha512_Init(&pctx, pass, passlen, salt, saltlen);
|
||||||
|
8
pbkdf2.h
8
pbkdf2.h
@ -43,14 +43,14 @@ typedef struct _PBKDF2_HMAC_SHA512_CTX {
|
|||||||
char first;
|
char first;
|
||||||
} PBKDF2_HMAC_SHA512_CTX;
|
} PBKDF2_HMAC_SHA512_CTX;
|
||||||
|
|
||||||
void pbkdf2_hmac_sha256_Init(PBKDF2_HMAC_SHA256_CTX *pctx, const uint8_t *pass, int passlen, uint8_t *salt, int saltlen);
|
void pbkdf2_hmac_sha256_Init(PBKDF2_HMAC_SHA256_CTX *pctx, const uint8_t *pass, int passlen, const uint8_t *salt, int saltlen);
|
||||||
void pbkdf2_hmac_sha256_Update(PBKDF2_HMAC_SHA256_CTX *pctx, uint32_t iterations);
|
void pbkdf2_hmac_sha256_Update(PBKDF2_HMAC_SHA256_CTX *pctx, uint32_t iterations);
|
||||||
void pbkdf2_hmac_sha256_Final(PBKDF2_HMAC_SHA256_CTX *pctx, uint8_t *key);
|
void pbkdf2_hmac_sha256_Final(PBKDF2_HMAC_SHA256_CTX *pctx, uint8_t *key);
|
||||||
void pbkdf2_hmac_sha256(const uint8_t *pass, int passlen, uint8_t *salt, int saltlen, uint32_t iterations, uint8_t *key);
|
void pbkdf2_hmac_sha256(const uint8_t *pass, int passlen, const uint8_t *salt, int saltlen, uint32_t iterations, uint8_t *key);
|
||||||
|
|
||||||
void pbkdf2_hmac_sha512_Init(PBKDF2_HMAC_SHA512_CTX *pctx, const uint8_t *pass, int passlen, uint8_t *salt, int saltlen);
|
void pbkdf2_hmac_sha512_Init(PBKDF2_HMAC_SHA512_CTX *pctx, const uint8_t *pass, int passlen, const uint8_t *salt, int saltlen);
|
||||||
void pbkdf2_hmac_sha512_Update(PBKDF2_HMAC_SHA512_CTX *pctx, uint32_t iterations);
|
void pbkdf2_hmac_sha512_Update(PBKDF2_HMAC_SHA512_CTX *pctx, uint32_t iterations);
|
||||||
void pbkdf2_hmac_sha512_Final(PBKDF2_HMAC_SHA512_CTX *pctx, uint8_t *key);
|
void pbkdf2_hmac_sha512_Final(PBKDF2_HMAC_SHA512_CTX *pctx, uint8_t *key);
|
||||||
void pbkdf2_hmac_sha512(const uint8_t *pass, int passlen, uint8_t *salt, int saltlen, uint32_t iterations, uint8_t *key);
|
void pbkdf2_hmac_sha512(const uint8_t *pass, int passlen, const uint8_t *salt, int saltlen, uint32_t iterations, uint8_t *key);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user