|
|
@ -1112,7 +1112,7 @@ static int encrypt_master_key(const char *passwd, const unsigned char *salt,
|
|
|
|
unsigned char *encrypted_master_key,
|
|
|
|
unsigned char *encrypted_master_key,
|
|
|
|
struct crypt_mnt_ftr *crypt_ftr)
|
|
|
|
struct crypt_mnt_ftr *crypt_ftr)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
unsigned char ikey[KEY_LEN_BYTES+IV_LEN_BYTES] = { 0 };
|
|
|
|
unsigned char ikey[32+32] = { 0 }; /* Big enough to hold a 256 bit key and 256 bit IV */
|
|
|
|
EVP_CIPHER_CTX e_ctx;
|
|
|
|
EVP_CIPHER_CTX e_ctx;
|
|
|
|
int encrypted_len, final_len;
|
|
|
|
int encrypted_len, final_len;
|
|
|
|
int rc = 0;
|
|
|
|
int rc = 0;
|
|
|
@ -1199,7 +1199,7 @@ static int decrypt_master_key_aux(const char *passwd, unsigned char *salt,
|
|
|
|
unsigned char** intermediate_key,
|
|
|
|
unsigned char** intermediate_key,
|
|
|
|
size_t* intermediate_key_size)
|
|
|
|
size_t* intermediate_key_size)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
unsigned char ikey[KEY_LEN_BYTES+IV_LEN_BYTES] = { 0 };
|
|
|
|
unsigned char ikey[32+32] = { 0 }; /* Big enough to hold a 256 bit key and 256 bit IV */
|
|
|
|
EVP_CIPHER_CTX d_ctx;
|
|
|
|
EVP_CIPHER_CTX d_ctx;
|
|
|
|
int decrypted_len, final_len;
|
|
|
|
int decrypted_len, final_len;
|
|
|
|
|
|
|
|
|
|
|
|