Georg/luksrku
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Slight refactoring of vault code

Browse Source 
We want to keep the dkey in the vault structure as long as it's open
(because only the open operation should take long, the close operation
should be really fast).
This commit is contained in:
Johannes Bauer 2019-10-26 10:33:36 +02:00
parent 1a765b6369
commit 8681e49561
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vault.c
View File

@ -33,9 +33,9 @@
#include "util.h" #include "util.h"
#include "log.h" #include "log.h"
static bool vault_derive_key(const struct vault_t *vault, uint8_t key[static 32]) { static bool vault_derive_key(const struct vault_t *vault, uint8_t dkey[static 32]) {
/* Derive the AES key from it */ /* Derive the AES key from it */
if (PKCS5_PBKDF2_HMAC((char*)vault->key, vault->key_length, NULL, 0, vault->iteration_cnt, EVP_sha256(), 32, key) != 1) { if (PKCS5_PBKDF2_HMAC((char*)vault->source_key, vault->source_key_length, NULL, 0, vault->iteration_cnt, EVP_sha256(), 32, dkey) != 1) {
return false; return false;
} }
return true; return true;
@ -80,9 +80,9 @@ struct vault_t* vault_init(unsigned int data_length, double target_derivation_ti
free(vault); free(vault);
return NULL; return NULL;
} }
vault->key = malloc(DEFAULT_KEY_LENGTH_BYTES); vault->source_key_length = DEFAULT_SOURCE_KEY_LENGTH_BYTES;
vault->key_length = DEFAULT_KEY_LENGTH_BYTES; vault->source_key = malloc(vault->source_key_length);
if (!vault->key) { if (!vault->source_key) {
vault_free(vault); vault_free(vault);
return NULL; return NULL;
} }
@ -103,8 +103,8 @@ static void vault_destroy_content(struct vault_t *vault) {
if (vault->data) { if (vault->data) {
OPENSSL_cleanse(vault->data, vault->data_length); OPENSSL_cleanse(vault->data, vault->data_length);
} }
if (vault->key) { if (vault->source_key) {
OPENSSL_cleanse(vault->key, vault->key_length); OPENSSL_cleanse(vault->source_key, vault->source_key_length);
} }
} }
@ -155,7 +155,7 @@ static bool vault_decrypt(struct vault_t *vault) {
} while (false); } while (false);
if (success) { if (success) {
OPENSSL_cleanse(vault->key, vault->key_length); OPENSSL_cleanse(vault->source_key, vault->source_key_length);
OPENSSL_cleanse(vault->auth_tag, 16); OPENSSL_cleanse(vault->auth_tag, 16);
} else { } else {
/* Vault may be in an inconsistent state. Destroy contents. */ /* Vault may be in an inconsistent state. Destroy contents. */
@ -181,7 +181,7 @@ bool vault_open(struct vault_t *vault) {
static bool vault_encrypt(struct vault_t *vault) { static bool vault_encrypt(struct vault_t *vault) {
/* Generate a new key source */ /* Generate a new key source */
if (RAND_bytes(vault->key, vault->key_length) != 1) { if (RAND_bytes(vault->source_key, vault->source_key_length) != 1) {
return false; return false;
} }
@ -260,9 +260,10 @@ void vault_free(struct vault_t *vault) {
if (!vault) { if (!vault) {
return; return;
} }
pthread_mutex_destroy(&vault->mutex);
vault_destroy_content(vault); vault_destroy_content(vault);
free(vault->data); free(vault->data);
free(vault->key); free(vault->source_key);
free(vault); free(vault);
} }

6
vault.h
View File

@ -33,14 +33,14 @@ struct vault_t {
unsigned int reference_count; unsigned int reference_count;
void *data; void *data;
unsigned int data_length; unsigned int data_length;
uint8_t *key; uint8_t *source_key;
unsigned int key_length; unsigned int source_key_length;
uint8_t auth_tag[16]; uint8_t auth_tag[16];
uint64_t iv; uint64_t iv;
unsigned int iteration_cnt; unsigned int iteration_cnt;
}; };
#define DEFAULT_KEY_LENGTH_BYTES (1024 * 1024) #define DEFAULT_SOURCE_KEY_LENGTH_BYTES (1024 * 1024)
/*************** AUTO GENERATED SECTION FOLLOWS ***************/ /*************** AUTO GENERATED SECTION FOLLOWS ***************/
struct vault_t* vault_init(unsigned int data_length, double target_derivation_time); struct vault_t* vault_init(unsigned int data_length, double target_derivation_time);