Fix two mem leaks in crypt_init_by_name_and_header().

[platform/upstream/cryptsetup.git] / lib / internal.h

diff --git a/lib/internal.h b/lib/internal.h
index 7b42082..d574911 100644 (file)
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -12,6 +12,11 @@
 
 #include "nls.h"
 #include "utils_crypt.h"
+#include "utils_loop.h"
+#include "utils_dm.h"
+
+/* to silent gcc -Wcast-qual for const cast */
+#define CONST_CAST(x) (x)(uintptr_t)
 
 #define SECTOR_SHIFT           9
 #define SECTOR_SIZE            (1 << SECTOR_SHIFT)
@@ -29,19 +34,6 @@
 
 struct crypt_device;
 
-struct hash_type {
-       char            *name;
-       void            *private;
-       int             (*fn)(void *data, int size, char *key,
-                             int sizep, const char *passphrase);
-};
-
-struct hash_backend {
-       const char              *name;
-       struct hash_type *      (*get_hashes)(void);
-       void                    (*free_hashes)(struct hash_type *hashes);
-};
-
 struct volume_key {
        size_t keylength;
        char key[];
@@ -57,53 +49,24 @@ void set_error_va(const char *fmt, va_list va);
 void set_error(const char *fmt, ...);
 const char *get_error(void);
 
-/* Device mapper backend - kernel support flags */
-#define DM_KEY_WIPE_SUPPORTED (1 << 0) /* key wipe message */
-#define DM_LMK_SUPPORTED      (1 << 1) /* lmk mode */
-#define DM_SECURE_SUPPORTED   (1 << 2) /* wipe (secure) buffer flag */
-uint32_t dm_flags(void);
-
-const char *dm_get_dir(void);
-int dm_init(struct crypt_device *context, int check_kernel);
-void dm_exit(void);
-int dm_remove_device(const char *name, int force, uint64_t size);
-int dm_status_device(const char *name);
-int dm_query_device(const char *name,
-                   char **device,
-                   uint64_t *size,
-                   uint64_t *skip,
-                   uint64_t *offset,
-                   char **cipher,
-                   int *key_size,
-                   char **key,
-                   int *read_only,
-                   int *suspended,
-                   char **uuid);
-int dm_create_device(const char *name, const char *device, const char *cipher,
-                    const char *type, const char *uuid,
-                    uint64_t size, uint64_t skip, uint64_t offset,
-                    size_t key_size, const char *key,
-                    int read_only, int reload);
-int dm_suspend_and_wipe_key(const char *name);
-int dm_resume_and_reinstate_key(const char *name,
-                               size_t key_size,
-                               const char *key);
+char *crypt_lookup_dev(const char *dev_id);
+int crypt_sysfs_check_crypt_segment(const char *device, uint64_t offset, uint64_t size);
 
 int sector_size_for_device(const char *device);
-ssize_t write_blockwise(int fd, const void *buf, size_t count);
+int device_read_ahead(const char *dev, uint32_t *read_ahead);
+ssize_t write_blockwise(int fd, void *buf, size_t count);
 ssize_t read_blockwise(int fd, void *_buf, size_t count);
-ssize_t write_lseek_blockwise(int fd, const char *buf, size_t count, off_t offset);
+ssize_t write_lseek_blockwise(int fd, char *buf, size_t count, off_t offset);
 int device_ready(struct crypt_device *cd, const char *device, int mode);
-int get_device_infos(const char *device,
-                    int open_exclusive,
-                    int *readonly,
-                    uint64_t *size);
+int device_size(const char *device, uint64_t *size);
+
+enum devcheck { DEV_OK = 0, DEV_EXCL = 1, DEV_SHARED = 2 };
 int device_check_and_adjust(struct crypt_device *cd,
                            const char *device,
-                           int open_exclusive,
+                           enum devcheck device_check,
                            uint64_t *size,
                            uint64_t *offset,
-                           int *read_only);
+                           uint32_t *flags);
 int wipe_device_header(const char *device, int sectors);
 
 void logger(struct crypt_device *cd, int class, const char *file, int line, const char *format, ...);
@@ -131,8 +94,14 @@ int crypt_random_get(struct crypt_device *ctx, char *buf, size_t len, int qualit
 void crypt_random_exit(void);
 int crypt_random_default_key_rng(void);
 
-int crypt_plain_hash(struct crypt_device *ctx, const char *hash_name,
-                    char *result, size_t size,
-                    const char *passphrase, size_t sizep);
+int crypt_plain_hash(struct crypt_device *ctx,
+                    const char *hash_name,
+                    char *key, size_t key_size,
+                    const char *passphrase, size_t passphrase_size);
+int PLAIN_activate(struct crypt_device *cd,
+                    const char *name,
+                    struct volume_key *vk,
+                    uint64_t size,
+                    uint32_t flags);
 
 #endif /* INTERNAL_H */