crypto: move built-in AES implementation into crypto/

To prepare for a generic internal cipher API, move the
built-in AES implementation into the crypto/ directory

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1435770638-25715-3-git-send-email-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Daniel P. Berrange 2015-07-01 18:10:30 +01:00 committed by Paolo Bonzini
parent ddbb0d0966
commit 6f2945cde6
11 changed files with 8 additions and 9 deletions

View File

@ -26,7 +26,7 @@
#include "qemu/module.h" #include "qemu/module.h"
#include <zlib.h> #include <zlib.h>
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qemu/aes.h" #include "crypto/aes.h"
#include "migration/migration.h" #include "migration/migration.h"
/**************************************************************/ /**************************************************************/

View File

@ -25,7 +25,6 @@
#include "block/block_int.h" #include "block/block_int.h"
#include "qemu/module.h" #include "qemu/module.h"
#include <zlib.h> #include <zlib.h>
#include "qemu/aes.h"
#include "block/qcow2.h" #include "block/qcow2.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"

View File

@ -25,7 +25,7 @@
#ifndef BLOCK_QCOW2_H #ifndef BLOCK_QCOW2_H
#define BLOCK_QCOW2_H #define BLOCK_QCOW2_H
#include "qemu/aes.h" #include "crypto/aes.h"
#include "block/coroutine.h" #include "block/coroutine.h"
//#define DEBUG_ALLOC //#define DEBUG_ALLOC

View File

@ -1,2 +1,3 @@
util-obj-y += init.o util-obj-y += init.o
util-obj-y += hash.o util-obj-y += hash.o
util-obj-y += aes.o

View File

@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/aes.h" #include "crypto/aes.h"
typedef uint32_t u32; typedef uint32_t u32;
typedef uint8_t u8; typedef uint8_t u8;

View File

@ -14,7 +14,7 @@
#include "cpu.h" #include "cpu.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "qemu/aes.h" #include "crypto/aes.h"
union CRYPTO_STATE { union CRYPTO_STATE {
uint8_t bytes[16]; uint8_t bytes[16];

View File

@ -20,7 +20,6 @@
#include <math.h> #include <math.h>
#include "cpu.h" #include "cpu.h"
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "qemu/aes.h"
#include "qemu/host-utils.h" #include "qemu/host-utils.h"
#include "exec/cpu_ldst.h" #include "exec/cpu_ldst.h"

View File

@ -18,7 +18,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/aes.h" #include "crypto/aes.h"
#if SHIFT == 0 #if SHIFT == 0
#define Reg MMXReg #define Reg MMXReg

View File

@ -19,7 +19,7 @@
#include "cpu.h" #include "cpu.h"
#include "qemu/host-utils.h" #include "qemu/host-utils.h"
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "qemu/aes.h" #include "crypto/aes.h"
#include "helper_regs.h" #include "helper_regs.h"
/*****************************************************************************/ /*****************************************************************************/

View File

@ -9,7 +9,7 @@ util-obj-y += acl.o
util-obj-y += error.o qemu-error.o util-obj-y += error.o qemu-error.o
util-obj-$(CONFIG_POSIX) += compatfd.o util-obj-$(CONFIG_POSIX) += compatfd.o
util-obj-y += id.o util-obj-y += id.o
util-obj-y += iov.o aes.o qemu-config.o qemu-sockets.o uri.o notify.o util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o
util-obj-y += qemu-option.o qemu-progress.o util-obj-y += qemu-option.o qemu-progress.o
util-obj-y += hexdump.o util-obj-y += hexdump.o
util-obj-y += crc32c.o util-obj-y += crc32c.o