From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/crypto/block-qcow.c | 174 ----------------------------------------------- 1 file changed, 174 deletions(-) delete mode 100644 qemu/crypto/block-qcow.c (limited to 'qemu/crypto/block-qcow.c') diff --git a/qemu/crypto/block-qcow.c b/qemu/crypto/block-qcow.c deleted file mode 100644 index be88c6f0e..000000000 --- a/qemu/crypto/block-qcow.c +++ /dev/null @@ -1,174 +0,0 @@ -/* - * QEMU Crypto block device encryption QCow/QCow2 AES-CBC format - * - * Copyright (c) 2015-2016 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - * - */ - -/* - * Note that the block encryption implemented in this file is broken - * by design. This exists only to allow data to be liberated from - * existing qcow[2] images and should not be used in any new areas. - */ - -#include "qemu/osdep.h" -#include "qapi/error.h" - -#include "crypto/block-qcow.h" -#include "crypto/secret.h" - -#define QCRYPTO_BLOCK_QCOW_SECTOR_SIZE 512 - - -static bool -qcrypto_block_qcow_has_format(const uint8_t *buf G_GNUC_UNUSED, - size_t buf_size G_GNUC_UNUSED) -{ - return false; -} - - -static int -qcrypto_block_qcow_init(QCryptoBlock *block, - const char *keysecret, - Error **errp) -{ - char *password; - int ret; - uint8_t keybuf[16]; - int len; - - memset(keybuf, 0, 16); - - password = qcrypto_secret_lookup_as_utf8(keysecret, errp); - if (!password) { - return -1; - } - - len = strlen(password); - memcpy(keybuf, password, MIN(len, sizeof(keybuf))); - g_free(password); - - block->niv = qcrypto_cipher_get_iv_len(QCRYPTO_CIPHER_ALG_AES_128, - QCRYPTO_CIPHER_MODE_CBC); - block->ivgen = qcrypto_ivgen_new(QCRYPTO_IVGEN_ALG_PLAIN64, - 0, 0, NULL, 0, errp); - if (!block->ivgen) { - ret = -ENOTSUP; - goto fail; - } - - block->cipher = qcrypto_cipher_new(QCRYPTO_CIPHER_ALG_AES_128, - QCRYPTO_CIPHER_MODE_CBC, - keybuf, G_N_ELEMENTS(keybuf), - errp); - if (!block->cipher) { - ret = -ENOTSUP; - goto fail; - } - - block->payload_offset = 0; - - return 0; - - fail: - qcrypto_cipher_free(block->cipher); - qcrypto_ivgen_free(block->ivgen); - return ret; -} - - -static int -qcrypto_block_qcow_open(QCryptoBlock *block, - QCryptoBlockOpenOptions *options, - QCryptoBlockReadFunc readfunc G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED, - unsigned int flags, - Error **errp) -{ - if (flags & QCRYPTO_BLOCK_OPEN_NO_IO) { - return 0; - } else { - if (!options->u.qcow.key_secret) { - error_setg(errp, - "Parameter 'key-secret' is required for cipher"); - return -1; - } - return qcrypto_block_qcow_init(block, - options->u.qcow.key_secret, errp); - } -} - - -static int -qcrypto_block_qcow_create(QCryptoBlock *block, - QCryptoBlockCreateOptions *options, - QCryptoBlockInitFunc initfunc G_GNUC_UNUSED, - QCryptoBlockWriteFunc writefunc G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED, - Error **errp) -{ - if (!options->u.qcow.key_secret) { - error_setg(errp, "Parameter 'key-secret' is required for cipher"); - return -1; - } - /* QCow2 has no special header, since everything is hardwired */ - return qcrypto_block_qcow_init(block, options->u.qcow.key_secret, errp); -} - - -static void -qcrypto_block_qcow_cleanup(QCryptoBlock *block) -{ -} - - -static int -qcrypto_block_qcow_decrypt(QCryptoBlock *block, - uint64_t startsector, - uint8_t *buf, - size_t len, - Error **errp) -{ - return qcrypto_block_decrypt_helper(block->cipher, - block->niv, block->ivgen, - QCRYPTO_BLOCK_QCOW_SECTOR_SIZE, - startsector, buf, len, errp); -} - - -static int -qcrypto_block_qcow_encrypt(QCryptoBlock *block, - uint64_t startsector, - uint8_t *buf, - size_t len, - Error **errp) -{ - return qcrypto_block_encrypt_helper(block->cipher, - block->niv, block->ivgen, - QCRYPTO_BLOCK_QCOW_SECTOR_SIZE, - startsector, buf, len, errp); -} - - -const QCryptoBlockDriver qcrypto_block_driver_qcow = { - .open = qcrypto_block_qcow_open, - .create = qcrypto_block_qcow_create, - .cleanup = qcrypto_block_qcow_cleanup, - .decrypt = qcrypto_block_qcow_decrypt, - .encrypt = qcrypto_block_qcow_encrypt, - .has_format = qcrypto_block_qcow_has_format, -}; -- cgit 1.2.3-korg