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>

diff --git a/block/qcow.c b/block/qcow.c
index 733627fbf24d4a1d7ca2eae0c35e972285de2821..bf5c57082fb10ddc2c4ac717377c9822f42581aa 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -26,7 +26,7 @@
 #include "qemu/module.h"
 #include <zlib.h>
 #include "qapi/qmp/qerror.h"
-#include "qemu/aes.h"
+#include "crypto/aes.h"
 #include "migration/migration.h"
 
 /**************************************************************/

diff --git a/block/qcow2.c b/block/qcow2.c
index d522ec7d14eaaba766e878dd6f0b6ece517332bd..85e07318c73698d7ec52e38d66b84ccee7a7e49e 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -25,7 +25,6 @@
 #include "block/block_int.h"
 #include "qemu/module.h"
 #include <zlib.h>
-#include "qemu/aes.h"
 #include "block/qcow2.h"
 #include "qemu/error-report.h"
 #include "qapi/qmp/qerror.h"

diff --git a/block/qcow2.h b/block/qcow2.h
index 5936d299a366fb418a6e65619f1571dc06277214..462147c17f5ef33d1859d8007fcdf06b63575335 100644 (file)
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -25,7 +25,7 @@
 #ifndef BLOCK_QCOW2_H
 #define BLOCK_QCOW2_H
 
-#include "qemu/aes.h"
+#include "crypto/aes.h"
 #include "block/coroutine.h"
 
 //#define DEBUG_ALLOC

diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
index 03cc1b232d651304fcae7a5ddf8d664395fafdf7..9efc9b414642705ca870511002b2983576bea04f 100644 (file)
--- a/crypto/Makefile.objs
+++ b/crypto/Makefile.objs
@@ -1,2 +1,3 @@
 util-obj-y += init.o
 util-obj-y += hash.o
+util-obj-y += aes.o

diff --git a/util/aes.c b/crypto/aes.c
similarity index 99%
rename from util/aes.c
rename to crypto/aes.c
index 3d7c4be9b62ce2199510412a753cfed3b73935e8..244a388eba0c3d20e0fe66b2538c12b59f1c55a9 100644 (file)
--- a/util/aes.c
+++ b/crypto/aes.c
@@ -28,7 +28,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "qemu-common.h"
-#include "qemu/aes.h"
+#include "crypto/aes.h"
 
 typedef uint32_t u32;
 typedef uint8_t u8;

diff --git a/include/qemu/aes.h b/include/crypto/aes.h
similarity index 100%
rename from include/qemu/aes.h
rename to include/crypto/aes.h

diff --git a/target-arm/crypto_helper.c b/target-arm/crypto_helper.c
index 1fe975d0f1e3b50541187d783762beb7de69a2df..5d228380659225f4d9ab9b226f2b3c1a5e0695bc 100644 (file)
--- a/target-arm/crypto_helper.c
+++ b/target-arm/crypto_helper.c
@@ -14,7 +14,7 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
-#include "qemu/aes.h"
+#include "crypto/aes.h"
 
 union CRYPTO_STATE {
     uint8_t    bytes[16];

diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c
index 30d34d5aee380809a8824a48cf6dcba12281a9b0..280adbac50af2020d7d4867225fc5c999b1f3057 100644 (file)
--- a/target-i386/fpu_helper.c
+++ b/target-i386/fpu_helper.c
@@ -20,7 +20,6 @@
 #include <math.h>
 #include "cpu.h"
 #include "exec/helper-proto.h"
-#include "qemu/aes.h"
 #include "qemu/host-utils.h"
 #include "exec/cpu_ldst.h"
 

diff --git a/target-i386/ops_sse.h b/target-i386/ops_sse.h
index 07650737927f16b5b88beca47f2248219ca74f63..bee134bae1931b6730def556b4911b56c05e16d3 100644 (file)
--- a/target-i386/ops_sse.h
+++ b/target-i386/ops_sse.h
@@ -18,7 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "qemu/aes.h"
+#include "crypto/aes.h"
 
 #if SHIFT == 0
 #define Reg MMXReg

diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c
index 4c2b71c7080a5e46142dcf724e2c4f72e3cc5d88..0a55d5e54b1c24de896f4d47e9176ddcb972c509 100644 (file)
--- a/target-ppc/int_helper.c
+++ b/target-ppc/int_helper.c
@@ -19,7 +19,7 @@
 #include "cpu.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
-#include "qemu/aes.h"
+#include "crypto/aes.h"
 
 #include "helper_regs.h"
 /*****************************************************************************/

diff --git a/util/Makefile.objs b/util/Makefile.objs
index ceaba309399fa379eb33d40e7955ea9b60da21ad..114d6578c4b2fb7a26aacdc544d8f698dba396bc 100644 (file)
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -9,7 +9,7 @@ util-obj-y += acl.o
 util-obj-y += error.o qemu-error.o
 util-obj-$(CONFIG_POSIX) += compatfd.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 += hexdump.o
 util-obj-y += crc32c.o