mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-30 05:36:10 +00:00
pkcs5v2: Add pkcs5v2_genkey_raw function
This is like pkcs5v2_genkey but takes a "passphrase" as a buffer and length rather than a NUL-terminated string. Reviwed by: pjd MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D46633
This commit is contained in:
parent
f4a69a933c
commit
8ce291a335
|
@ -51,13 +51,22 @@ void
|
|||
pkcs5v2_genkey(uint8_t *key, unsigned keylen, const uint8_t *salt,
|
||||
size_t saltsize, const char *passphrase, u_int iterations)
|
||||
{
|
||||
|
||||
pkcs5v2_genkey_raw(key, keylen, salt, saltsize, passphrase,
|
||||
strlen(passphrase), iterations);
|
||||
}
|
||||
|
||||
void
|
||||
pkcs5v2_genkey_raw(uint8_t *key, unsigned keylen, const uint8_t *salt,
|
||||
size_t saltsize, const uint8_t *passphrase, size_t passlen,
|
||||
u_int iterations)
|
||||
{
|
||||
uint8_t md[SHA512_MDLEN], saltcount[saltsize + sizeof(uint32_t)];
|
||||
uint8_t *counter, *keyp;
|
||||
u_int i, bsize, passlen;
|
||||
u_int i, bsize;
|
||||
uint32_t count;
|
||||
struct hmac_ctx startpoint, ctx;
|
||||
|
||||
passlen = strlen(passphrase);
|
||||
bzero(key, keylen);
|
||||
bcopy(salt, saltcount, saltsize);
|
||||
counter = saltcount + saltsize;
|
||||
|
|
|
@ -30,6 +30,9 @@
|
|||
#define _PKCS5V2_H_
|
||||
void pkcs5v2_genkey(uint8_t *key, unsigned keylen, const uint8_t *salt,
|
||||
size_t saltsize, const char *passphrase, u_int iterations);
|
||||
void pkcs5v2_genkey_raw(uint8_t *key, unsigned keylen, const uint8_t *salt,
|
||||
size_t saltsize, const uint8_t *passphrase, size_t passlen,
|
||||
u_int iterations);
|
||||
#ifndef _KERNEL
|
||||
int pkcs5v2_calculate(int usecs);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue