eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 20:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bitlk: clean up some inlcudes and warnings.

Browse Source
This commit is contained in:
Milan Broz
2019-11-10 09:30:06 +01:00
parent 2227797691
commit 06268963fb
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/bitlk/bitlk.c
View File

@@ -21,19 +21,15 @@
*/ */
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <assert.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <time.h> #include <time.h>
#include <iconv.h> #include <iconv.h>
#include <limits.h>
#include "libcryptsetup.h"
#include "bitlk.h" #include "bitlk.h"
#include "internal.h" #include "internal.h"
#include "bitops.h"
#define BITLK_BOOTCODE_V1 "\xeb\x52\x90" #define BITLK_BOOTCODE_V1 "\xeb\x52\x90"
#define BITLK_BOOTCODE_V2 "\xeb\x58\x90" #define BITLK_BOOTCODE_V2 "\xeb\x58\x90"
@@ -364,10 +360,10 @@ int BITLK_read_sb(struct crypt_device *cd, struct bitlk_metadata *params)
{ {
int devfd; int devfd;
struct device *device = crypt_metadata_device(cd); struct device *device = crypt_metadata_device(cd);
struct bitlk_signature sig = {0}; struct bitlk_signature sig = {};
struct bitlk_superblock sb = {0}; struct bitlk_superblock sb = {};
struct bitlk_fve_metadata fve = {0}; struct bitlk_fve_metadata fve = {};
struct bitlk_entry_vmk entry_vmk = {0}; struct bitlk_entry_vmk entry_vmk = {};
uint8_t *fve_entries = NULL; uint8_t *fve_entries = NULL;
int fve_offset = 0; int fve_offset = 0;
char guid_buf[UUID_STR_LEN] = {0}; char guid_buf[UUID_STR_LEN] = {0};
@@ -716,7 +712,7 @@ static int bitlk_kdf(struct crypt_device *cd,
const uint8_t *salt, const uint8_t *salt,
struct volume_key **vk) struct volume_key **vk)
{ {
struct bitlk_kdf_data kdf = {0}; struct bitlk_kdf_data kdf = {};
struct crypt_hash *hd = NULL; struct crypt_hash *hd = NULL;
int len = 0; int len = 0;
char *utf16Password = NULL; char *utf16Password = NULL;

6
lib/bitlk/bitlk.h
View File

@@ -23,14 +23,12 @@
#ifndef _CRYPTSETUP_BITLK_H #ifndef _CRYPTSETUP_BITLK_H
#define _CRYPTSETUP_BITLK_H #define _CRYPTSETUP_BITLK_H
#include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
#include "internal.h" #include <stdbool.h>
struct crypt_device; struct crypt_device;
struct device; struct device;
struct crypt_params_bitlk;
#define BITLK_NONCE_SIZE 12 #define BITLK_NONCE_SIZE 12
#define BITLK_SALT_SIZE 16 #define BITLK_SALT_SIZE 16