Remove old API functions (all functions using crypt_options).
authorMilan Broz <gmazyland@gmail.com>
Thu, 7 Jul 2011 14:32:42 +0000 (14:32 +0000)
committerMilan Broz <gmazyland@gmail.com>
Thu, 7 Jul 2011 14:32:42 +0000 (14:32 +0000)
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@561 36d66b0a-2a48-0410-832c-cd162a569da5

ChangeLog
configure.in
lib/libcryptsetup.h
lib/libcryptsetup.sym
lib/setup.c
tests/api-test.c

index 1e68e52..e227673 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-07-07  Milan Broz  <mbroz@redhat.com>
+       * Remove old API functions (all functions using crypt_options).
+
 2011-07-01  Milan Broz  <mbroz@redhat.com>
        * Add --shared option for creating non-overlapping crypt segments.
        * Add shared flag to libcryptsetup api.
index 8d71bd8..8fa8df2 100644 (file)
@@ -1,9 +1,9 @@
 AC_PREREQ([2.67])
-AC_INIT([cryptsetup],[1.3.2-cvs])
+AC_INIT([cryptsetup],[1.4.0-cvs])
 
 dnl library version from <major>.<minor>.<release>[-<suffix>]
 LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)
-LIBCRYPTSETUP_VERSION_INFO=3:0:2
+LIBCRYPTSETUP_VERSION_INFO=4:0:0
 
 AC_CONFIG_SRCDIR(src/cryptsetup.c)
 AC_CONFIG_MACRO_DIR([m4])
index 5d6128a..4e8089b 100644 (file)
@@ -613,67 +613,6 @@ const char *crypt_get_dir(void);
 #define CRYPT_DEBUG_NONE  0
 void crypt_set_debug_level(int level);
 
-/**
- * OLD DEPRECATED API **********************************
- *
- * Provided only for backward compatibility.
- */
-
-struct interface_callbacks {
-    int (*yesDialog)(char *msg);
-    void (*log)(int level, char *msg);
-};
-
-#define        CRYPT_FLAG_VERIFY               (1 << 0)
-#define CRYPT_FLAG_READONLY            (1 << 1)
-#define        CRYPT_FLAG_VERIFY_IF_POSSIBLE   (1 << 2)
-#define        CRYPT_FLAG_VERIFY_ON_DELKEY     (1 << 3)
-#define        CRYPT_FLAG_NON_EXCLUSIVE_ACCESS (1 << 4)
-
-struct crypt_options {
-       const char      *name;
-       const char      *device;
-
-       const char      *cipher;
-       const char      *hash;
-
-       const char      *passphrase;
-       int             passphrase_fd;
-       const char      *key_file;
-       const char      *new_key_file;
-       int             key_size;
-
-       unsigned int    flags;
-       int             key_slot;
-
-       uint64_t        size;
-       uint64_t        offset;
-       uint64_t        skip;
-       uint64_t        iteration_time;
-       uint64_t        timeout;
-
-       uint64_t        align_payload;
-       int             tries;
-
-       struct interface_callbacks *icb;
-};
-
-int crypt_create_device(struct crypt_options *options);
-int crypt_update_device(struct crypt_options *options);
-int crypt_resize_device(struct crypt_options *options);
-int crypt_query_device(struct crypt_options *options);
-int crypt_remove_device(struct crypt_options *options);
-int crypt_luksFormat(struct crypt_options *options);
-int crypt_luksOpen(struct crypt_options *options);
-int crypt_luksKillSlot(struct crypt_options *options);
-int crypt_luksRemoveKey(struct crypt_options *options);
-int crypt_luksAddKey(struct crypt_options *options);
-int crypt_luksUUID(struct crypt_options *options);
-int crypt_isLuks(struct crypt_options *options);
-int crypt_luksDump(struct crypt_options *options);
-
-void crypt_put_options(struct crypt_options *options);
-
 #ifdef __cplusplus
 }
 #endif
index 1536899..da521ca 100644 (file)
@@ -54,22 +54,6 @@ CRYPTSETUP_1.0 {
 
                crypt_header_backup;
                crypt_header_restore;
-
-               crypt_create_device;
-               crypt_update_device;
-               crypt_resize_device;
-               crypt_query_device;
-               crypt_remove_device;
-               crypt_luksFormat;
-               crypt_luksOpen;
-               crypt_luksKillSlot;
-               crypt_luksRemoveKey;
-               crypt_luksAddKey;
-               crypt_luksUUID;
-               crypt_isLuks;
-               crypt_luksDump;
-
-               crypt_put_options;
        local:
                *;
 };
index 550928d..fd68109 100644 (file)
@@ -233,117 +233,6 @@ static int keyslot_verify_or_find_empty(struct crypt_device *cd, int *keyslot)
        return 0;
 }
 
-static int verify_other_keyslot(struct crypt_device *cd,
-                               const char *key_file,
-                               int keyIndex)
-{
-       struct volume_key *vk = NULL;
-       crypt_keyslot_info ki;
-       int openedIndex, r;
-       char *password = NULL;
-       size_t passwordLen;
-
-       r = crypt_get_key(_("Enter any remaining LUKS passphrase: "),
-                         &password, &passwordLen, 0, key_file, cd->timeout,
-                         cd->password_verify, cd);
-       if(r < 0)
-               goto out;
-
-       ki = crypt_keyslot_status(cd, keyIndex);
-       if (ki == CRYPT_SLOT_ACTIVE) /* Not last slot */
-               LUKS_keyslot_set(&cd->hdr, keyIndex, 0);
-
-       openedIndex = LUKS_open_key_with_hdr(cd->device, CRYPT_ANY_SLOT,
-                                            password, passwordLen,
-                                            &cd->hdr, &vk, cd);
-
-       if (ki == CRYPT_SLOT_ACTIVE)
-               LUKS_keyslot_set(&cd->hdr, keyIndex, 1);
-
-       if (openedIndex < 0)
-               r = -EPERM;
-       else
-               log_verbose(cd, _("Key slot %d verified.\n"), openedIndex);
-out:
-       crypt_free_volume_key(vk);
-       crypt_safe_free(password);
-       return r;
-}
-
-static int find_keyslot_by_passphrase(struct crypt_device *cd,
-                                     const char *key_file,
-                                     char *message)
-{
-       struct volume_key *vk = NULL;
-       char *password = NULL;
-       size_t passwordLen;
-       int r;
-
-       r = crypt_get_key(message,&password,&passwordLen, 0, key_file,
-                         cd->timeout, cd->password_verify, cd);
-       if (r < 0)
-               goto out;
-
-       r = LUKS_open_key_with_hdr(cd->device, CRYPT_ANY_SLOT, password,
-                                  passwordLen, &cd->hdr, &vk, cd);
-out:
-       crypt_free_volume_key(vk);
-       crypt_safe_free(password);
-       return r;
-}
-
-static int luks_remove_helper(struct crypt_device *cd,
-                             int key_slot,
-                             const char *other_key_file,
-                             const char *key_file,
-                             int verify)
-{
-       crypt_keyslot_info ki;
-       int r = -EINVAL;
-
-       if (key_slot == CRYPT_ANY_SLOT) {
-               key_slot = find_keyslot_by_passphrase(cd, key_file,
-                               _("Enter LUKS passphrase to be deleted: "));
-               if(key_slot < 0) {
-                       r = -EPERM;
-                       goto out;
-               }
-
-               log_std(cd, _("Key slot %d selected for deletion.\n"), key_slot);
-       }
-
-       ki = crypt_keyslot_status(cd, key_slot);
-       if (ki == CRYPT_SLOT_INVALID) {
-               log_err(cd, _("Key slot %d is invalid, please select between 0 and %d.\n"),
-                       key_slot, LUKS_NUMKEYS - 1);
-               r = -EINVAL;
-               goto out;
-       }
-       if (ki <= CRYPT_SLOT_INACTIVE) {
-               log_err(cd, _("Key %d not active. Can't wipe.\n"), key_slot);
-               r = -EINVAL;
-               goto out;
-       }
-
-       if (ki == CRYPT_SLOT_ACTIVE_LAST && cd->confirm &&
-           !(cd->confirm(_("This is the last keyslot."
-                           " Device will become unusable after purging this key."),
-                        cd->confirm_usrptr))) {
-               r = -EINVAL;
-               goto out;
-       }
-
-       if(verify)
-               r = verify_other_keyslot(cd, other_key_file, key_slot);
-       else
-               r = 0;
-
-       if (!r)
-               r = crypt_keyslot_destroy(cd, key_slot);
-out:
-       return (r < 0) ? r : 0;
-}
-
 static int create_device_helper(struct crypt_device *cd,
                                const char *name,
                                const char *hash,
@@ -449,18 +338,6 @@ static int open_from_hdr_and_vk(struct crypt_device *cd,
        return r;
 }
 
-static void log_wrapper(int level, const char *msg, void *usrptr)
-{
-       void (*xlog)(int level, char *msg) = usrptr;
-       xlog(level, (char *)msg);
-}
-
-static int yesDialog_wrapper(const char *msg, void *usrptr)
-{
-       int (*xyesDialog)(char *msg) = usrptr;
-       return xyesDialog((char*)msg);
-}
-
 int crypt_confirm(struct crypt_device *cd, const char *msg)
 {
        if (!cd || !cd->confirm)
@@ -550,54 +427,6 @@ static int key_from_file(struct crypt_device *cd, char *msg,
                             cd->timeout, 0, cd);
 }
 
-static int _crypt_init(struct crypt_device **cd,
-                      const char *type,
-                      struct crypt_options *options,
-                      int load, int need_dm)
-{
-       int init_by_name, r;
-
-       /* if it is plain device and mapping table is being reloaded
-       initialize it by name*/
-       init_by_name = (type && !strcmp(type, CRYPT_PLAIN) && load);
-
-       /* Some of old API calls do not require DM in kernel,
-          fake initialisation by initialise it with kernel_check disabled */
-       if (!need_dm)
-               (void)dm_init(NULL, 0);
-       if (init_by_name)
-               r = crypt_init_by_name(cd, options->name);
-       else
-               r = crypt_init(cd, options->device);
-       if (!need_dm)
-               dm_exit();
-
-       if (r)
-               return -EINVAL;
-
-       crypt_set_log_callback(*cd, log_wrapper, options->icb->log);
-       crypt_set_confirm_callback(*cd, yesDialog_wrapper, options->icb->yesDialog);
-
-       crypt_set_timeout(*cd, options->timeout);
-       crypt_set_password_retry(*cd, options->tries);
-       crypt_set_iterarion_time(*cd, options->iteration_time ?: 1000);
-       crypt_set_password_verify(*cd, options->flags & CRYPT_FLAG_VERIFY);
-
-       if (load && !init_by_name)
-               r = crypt_load(*cd, type, NULL);
-
-       if (!r && type && !(*cd)->type) {
-               (*cd)->type = strdup(type);
-               if (!(*cd)->type)
-                       r = -ENOMEM;
-       }
-
-       if (r)
-               crypt_free(*cd);
-
-       return r;
-}
-
 void crypt_set_log_callback(struct crypt_device *cd,
        void (*log)(int level, const char *msg, void *usrptr),
        void *usrptr)
@@ -626,356 +455,6 @@ void crypt_set_password_callback(struct crypt_device *cd,
        cd->password_usrptr = usrptr;
 }
 
-/* OPTIONS: name, cipher, device, hash, key_file, key_size, key_slot,
- *          offset, size, skip, timeout, tries, passphrase_fd (ignored),
- *          flags, icb */
-static int crypt_create_and_update_device(struct crypt_options *options, int update)
-{
-       struct crypt_device *cd = NULL;
-       char *passphrase = NULL;
-       size_t passphrase_size = 0;
-       uint32_t activation_flags;
-       int r;
-
-       activation_flags = options->flags & CRYPT_FLAG_READONLY ?
-                          CRYPT_ACTIVATE_READONLY : 0;
-
-       r = _crypt_init(&cd, CRYPT_PLAIN, options, 0, 1);
-       if (r)
-               return r;
-
-       r = crypt_get_key(_("Enter passphrase: "), &passphrase, &passphrase_size,
-                         options->key_size, options->key_file,
-                         cd->timeout, cd->password_verify, cd);
-       if (!r)
-               r = create_device_helper(cd, options->name, options->hash,
-                       options->cipher, NULL, options->key_file,
-                       passphrase, passphrase_size,
-                       options->key_size, options->size, options->skip,
-                       options->offset, NULL, activation_flags, update);
-
-       crypt_safe_free(passphrase);
-       crypt_free(cd);
-       return r;
-}
-
-int crypt_create_device(struct crypt_options *options)
-{
-       return crypt_create_and_update_device(options, 0);
-}
-
-int crypt_update_device(struct crypt_options *options)
-{
-       return crypt_create_and_update_device(options, 1);
-}
-
-/* OPTIONS: name, size, icb */
-int crypt_resize_device(struct crypt_options *options)
-{
-       struct crypt_device *cd = NULL;
-       char *device = NULL, *cipher = NULL, *uuid = NULL, *key = NULL;
-       const char *type = NULL;
-       uint64_t size, skip, offset;
-       int key_size, read_only, r;
-
-       log_dbg("Resizing device %s to %" PRIu64 " sectors.", options->name, options->size);
-
-       if (dm_init(NULL, 1) < 0)
-               return -ENOSYS;
-
-       r = dm_query_device(options->name, &device, &size, &skip, &offset,
-                           &cipher, &key_size, &key, &read_only, NULL, &uuid);
-       if (r < 0) {
-               log_err(NULL, _("Device %s is not active.\n"), options->name);
-               goto out;
-       }
-
-       /* Try to determine type of device from UUID */
-       type = CRYPT_PLAIN;
-       if (uuid) {
-               if (!strncmp(uuid, CRYPT_PLAIN, strlen(CRYPT_PLAIN))) {
-                       type = CRYPT_PLAIN;
-                       free (uuid);
-                       uuid = NULL;
-               } else if (!strncmp(uuid, CRYPT_LUKS1, strlen(CRYPT_LUKS1)))
-                       type = CRYPT_LUKS1;
-       }
-
-       if (!options->device)
-               options->device = device;
-
-       r = _crypt_init(&cd, type, options, 1, 1);
-       if (r)
-               goto out;
-
-       size = options->size;
-       r = device_check_and_adjust(cd, device, DEV_OK, &size, &offset, &read_only);
-       if (r)
-               goto out;
-
-       r = dm_create_device(options->name, device, cipher, type,
-                            crypt_get_uuid(cd), size, skip, offset,
-                            key_size, key, read_only, 1);
-out:
-       crypt_safe_free(key);
-       free(cipher);
-       if (options->device == device)
-               options->device = NULL;
-       free(device);
-       free(uuid);
-       crypt_free(cd);
-       dm_exit();
-       return r;
-}
-
-/* OPTIONS: name, icb */
-int crypt_query_device(struct crypt_options *options)
-{
-       int read_only, r;
-
-       log_dbg("Query device %s.", options->name);
-
-       if (dm_init(NULL, 1) < 0)
-               return -ENOSYS;
-
-       r = dm_status_device(options->name);
-       if (r < 0)
-               goto out;
-
-       r = dm_query_device(options->name, (char **)&options->device, &options->size,
-                           &options->skip, &options->offset, (char **)&options->cipher,
-                           &options->key_size, NULL, &read_only, NULL, NULL);
-       if (r >= 0) {
-               if (read_only)
-                       options->flags |= CRYPT_FLAG_READONLY;
-
-               options->flags |= CRYPT_FLAG_FREE_DEVICE;
-               options->flags |= CRYPT_FLAG_FREE_CIPHER;
-
-               r = 1;
-       }
-out:
-       if (r == -ENODEV)
-               r = 0;
-
-       dm_exit();
-       return r;
-}
-
-/* OPTIONS: name, icb */
-int crypt_remove_device(struct crypt_options *options)
-{
-       struct crypt_device *cd = NULL;
-       int r;
-
-       r = crypt_init_by_name(&cd, options->name);
-       if (r == 0)
-               r = crypt_deactivate(cd, options->name);
-
-       crypt_free(cd);
-       return r;
-
-}
-
-/* OPTIONS: device, cipher, hash, align_payload, key_size (master key), key_slot
- *          new_key_file, iteration_time, timeout, flags, icb */
-int crypt_luksFormat(struct crypt_options *options)
-{
-       char cipherName[LUKS_CIPHERNAME_L];
-       char cipherMode[LUKS_CIPHERMODE_L];
-       char *password=NULL;
-       size_t passwordLen;
-       struct crypt_device *cd = NULL;
-       struct crypt_params_luks1 cp = {
-               .hash = options->hash,
-               .data_alignment = options->align_payload
-       };
-       int r;
-
-       r = crypt_parse_name_and_mode(options->cipher, cipherName, NULL, cipherMode);
-       if(r < 0) {
-               log_err(cd, _("No known cipher specification pattern detected.\n"));
-               return r;
-       }
-
-       if ((r = _crypt_init(&cd, CRYPT_LUKS1, options, 0, 1)))
-               return r;
-
-       if (options->key_slot >= LUKS_NUMKEYS && options->key_slot != CRYPT_ANY_SLOT) {
-               log_err(cd, _("Key slot %d is invalid, please select between 0 and %d.\n"),
-                       options->key_slot, LUKS_NUMKEYS - 1);
-               r = -EINVAL;
-               goto out;
-       }
-
-       r = crypt_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen, 0,
-                         options->new_key_file, cd->timeout, cd->password_verify, cd);
-
-       if(r < 0)
-               goto out;
-
-       r = crypt_format(cd, CRYPT_LUKS1, cipherName, cipherMode,
-                        NULL, NULL, options->key_size, &cp);
-       if (r < 0)
-               goto out;
-
-       /* Add keyslot using internally stored volume key generated during format */
-       r = crypt_keyslot_add_by_volume_key(cd, options->key_slot, NULL, 0,
-                                           password, passwordLen);
-out:
-       crypt_free(cd);
-       crypt_safe_free(password);
-       return (r < 0) ? r : 0;
-}
-
-/* OPTIONS: name, device, key_size, key_file, timeout, tries, flags, icb */
-int crypt_luksOpen(struct crypt_options *options)
-{
-       struct crypt_device *cd = NULL;
-       uint32_t flags = 0;
-       int r;
-
-       if (!options->name)
-               return -EINVAL;
-
-       r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 1);
-       if (r)
-               return r;
-
-       if (options->flags & CRYPT_FLAG_READONLY)
-               flags |= CRYPT_ACTIVATE_READONLY;
-
-       if (options->flags & CRYPT_FLAG_NON_EXCLUSIVE_ACCESS)
-               flags |= CRYPT_ACTIVATE_NO_UUID;
-
-       if (options->key_file)
-               r = crypt_activate_by_keyfile(cd, options->name,
-                       CRYPT_ANY_SLOT, options->key_file, 0,
-                       flags);
-       else
-               r = crypt_activate_by_passphrase(cd, options->name,
-                       CRYPT_ANY_SLOT, options->passphrase,
-                       options->passphrase ? strlen(options->passphrase) : 0,
-                       flags);
-
-       crypt_free(cd);
-       return (r < 0) ? r : 0;
-}
-
-/* OPTIONS: device, keys_slot, key_file, timeout, flags, icb */
-int crypt_luksKillSlot(struct crypt_options *options)
-{
-       struct crypt_device *cd = NULL;
-       int r;
-
-       r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 1);
-       if (r)
-               return r;
-
-       r = luks_remove_helper(cd, options->key_slot, options->key_file, NULL,
-                              options->flags & CRYPT_FLAG_VERIFY_ON_DELKEY);
-
-       crypt_free(cd);
-       return (r < 0) ? r : 0;
-}
-
-/* OPTIONS: device, new_key_file, key_file, timeout, flags, icb */
-int crypt_luksRemoveKey(struct crypt_options *options)
-{
-       struct crypt_device *cd = NULL;
-       int r;
-
-       r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 1);
-       if (r)
-               return r;
-
-       r = luks_remove_helper(cd, CRYPT_ANY_SLOT, options->key_file, options->new_key_file,
-                              options->flags & CRYPT_FLAG_VERIFY_ON_DELKEY);
-
-       crypt_free(cd);
-       return (r < 0) ? r : 0;
-}
-
-
-/* OPTIONS: device, new_key_file, key_file, key_slot, flags,
-            iteration_time, timeout, icb */
-int crypt_luksAddKey(struct crypt_options *options)
-{
-       struct crypt_device *cd = NULL;
-       int r = -EINVAL;
-
-       r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 1);
-       if (r)
-               return r;
-
-       if (options->key_file || options->new_key_file)
-               r = crypt_keyslot_add_by_keyfile(cd, options->key_slot,
-                                                options->key_file, 0,
-                                                options->new_key_file, 0);
-       else
-               r = crypt_keyslot_add_by_passphrase(cd, options->key_slot,
-                                                   NULL, 0, NULL, 0);
-
-       crypt_free(cd);
-       return (r < 0) ? r : 0;
-}
-
-/* OPTIONS: device, icb */
-int crypt_luksUUID(struct crypt_options *options)
-{
-       struct crypt_device *cd = NULL;
-       const char *uuid;
-       int r;
-
-       r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 0);
-       if (r)
-               return r;
-
-       uuid = crypt_get_uuid(cd);
-       log_std(cd, "%s\n", uuid ?: "");
-       crypt_free(cd);
-       return 0;
-}
-
-/* OPTIONS: device, icb */
-int crypt_isLuks(struct crypt_options *options)
-{
-       struct crypt_device *cd = NULL;
-       int r;
-
-       log_dbg("Check device %s for LUKS header.", options->device);
-
-       r = init_crypto(cd);
-       if (r < 0)
-               return r;
-
-       r = crypt_init(&cd, options->device);
-       if (r < 0)
-               return -EINVAL;
-
-       /* Do print fail here, no need to crypt_load() */
-       r = LUKS_read_phdr(cd->device, &cd->hdr, 0, cd) ? -EINVAL : 0;
-
-       crypt_free(cd);
-       return r;
-}
-
-/* OPTIONS: device, icb */
-int crypt_luksDump(struct crypt_options *options)
-{
-       struct crypt_device *cd = NULL;
-       int r;
-
-       r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 0);
-       if(r < 0)
-               return r;
-
-       r = crypt_dump(cd);
-
-       crypt_free(cd);
-       return r;
-}
-
 void crypt_get_error(char *buf, size_t size)
 {
        const char *error = get_error();
@@ -990,20 +469,6 @@ void crypt_get_error(char *buf, size_t size)
                buf[0] = '\0';
 }
 
-void crypt_put_options(struct crypt_options *options)
-{
-       if (options->flags & CRYPT_FLAG_FREE_DEVICE) {
-               free((char *)options->device);
-               options->device = NULL;
-               options->flags &= ~CRYPT_FLAG_FREE_DEVICE;
-       }
-       if (options->flags & CRYPT_FLAG_FREE_CIPHER) {
-               free((char *)options->cipher);
-               options->cipher = NULL;
-               options->flags &= ~CRYPT_FLAG_FREE_CIPHER;
-       }
-}
-
 const char *crypt_get_dir(void)
 {
        return dm_get_dir();
index 03a621b..ec4e3d9 100644 (file)
@@ -153,11 +153,6 @@ static int crypt_decode_key(char *key, char *hex, unsigned int size)
        return 0;
 }
 
-static int yesDialog(char *msg)
-{
-       return 1;
-}
-
 static void cmdLineLog(int level, char *msg)
 {
        strncat(global_log, msg, sizeof(global_log) - strlen(global_log));
@@ -169,7 +164,6 @@ static void new_log(int level, const char *msg, void *usrptr)
        cmdLineLog(level, (char*)msg);
 }
 
-
 static void reset_log()
 {
        memset(global_log, 0, sizeof(global_log));
@@ -182,11 +176,6 @@ static void _system(const char *command, int warn)
                printf("System command failed: %s", command);
 }
 
-static struct interface_callbacks cmd_icb = {
-       .yesDialog = yesDialog,
-       .log = cmdLineLog,
-};
-
 static void _cleanup(void)
 {
        struct stat st;
@@ -300,6 +289,17 @@ void xlog(const char *msg, const char *tst, const char *func, int line, const ch
 
 #define RUN_(x, y)             do { printf("%s: %s\n", #x, (y)); x(); } while (0)
 
+#if 0
+static int yesDialog(char *msg)
+{
+       return 1;
+}
+
+static struct interface_callbacks cmd_icb = {
+       .yesDialog = yesDialog,
+       .log = cmdLineLog,
+};
+
 // OLD API TESTS
 static void LuksUUID(void)
 {
@@ -589,6 +589,7 @@ void DeviceResizeGame(void)
 
        _remove_keyfiles();
 }
+#endif
 
 // NEW API tests
 
@@ -1097,7 +1098,7 @@ int main (int argc, char *argv[])
        crypt_set_debug_level(_debug ? CRYPT_DEBUG_ALL : CRYPT_DEBUG_NONE);
 
        RUN_(NonFIPSAlg, "Crypto is properly initialised in format"); //must be the first!
-
+#if 0
        RUN_(LuksUUID, "luksUUID API call");
        RUN_(IsLuks, "isLuks API call");
        RUN_(LuksOpen, "luksOpen API call");
@@ -1106,7 +1107,7 @@ int main (int argc, char *argv[])
        RUN_(LuksFormat, "luksFormat API call");
        RUN_(LuksKeyGame, "luksAddKey, RemoveKey, KillSlot API calls");
        RUN_(DeviceResizeGame, "regular crypto, resize calls");
-
+#endif
        RUN_(AddDevicePlain, "plain device API creation exercise");
        RUN_(HashDevicePlain, "plain device API hash test");
        RUN_(AddDeviceLuks, "Format and use LUKS device");