From patchwork Sun Mar 31 11:02:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 232602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 349C72C00F1 for ; Sun, 31 Mar 2013 22:04:41 +1100 (EST) Received: from localhost ([::1]:36318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMG3z-0004no-DM for incoming@patchwork.ozlabs.org; Sun, 31 Mar 2013 07:04:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMG28-0001On-D9 for qemu-devel@nongnu.org; Sun, 31 Mar 2013 07:02:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UMG1y-0004Pr-3v for qemu-devel@nongnu.org; Sun, 31 Mar 2013 07:02:44 -0400 Received: from hall.aurel32.net ([2001:470:1f15:c4f::1]:46346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMG1x-0004P4-Tf for qemu-devel@nongnu.org; Sun, 31 Mar 2013 07:02:34 -0400 Received: from [2001:470:d4ed:0:ea11:32ff:fea1:831a] (helo=ohm.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1UMG1w-0003uZ-L8; Sun, 31 Mar 2013 13:02:32 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1UMG1u-00015M-Jx; Sun, 31 Mar 2013 13:02:30 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Sun, 31 Mar 2013 13:02:24 +0200 Message-Id: <1364727746-2686-6-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364727746-2686-1-git-send-email-aurelien@aurel32.net> References: <1364727746-2686-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:470:1f15:c4f::1 Cc: Kevin Wolf , Stefan Hajnoczi , Aurelien Jarno Subject: [Qemu-devel] [PATCH v4 5/7] aes: move aes.h from include/block to include/qemu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move aes.h from include/block to include/qemu to show it can be reused by other subsystems. Cc: Kevin Wolf Cc: Stefan Hajnoczi Reviewed-by: Edgar E. Iglesias Reviewed-by: Richard Henderson Signed-off-by: Aurelien Jarno Reviewed-by: Stefan Hajnoczi --- block/qcow.c | 2 +- block/qcow2.c | 2 +- block/qcow2.h | 2 +- include/block/aes.h | 26 -------------------------- include/qemu/aes.h | 26 ++++++++++++++++++++++++++ util/aes.c | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 include/block/aes.h create mode 100644 include/qemu/aes.h diff --git a/block/qcow.c b/block/qcow.c index 13d396b..3278e55 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -25,7 +25,7 @@ #include "block/block_int.h" #include "qemu/module.h" #include -#include "block/aes.h" +#include "qemu/aes.h" #include "migration/migration.h" /**************************************************************/ diff --git a/block/qcow2.c b/block/qcow2.c index 7e7d775..1d18073 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -25,7 +25,7 @@ #include "block/block_int.h" #include "qemu/module.h" #include -#include "block/aes.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 bf8db2a..9421843 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -25,7 +25,7 @@ #ifndef BLOCK_QCOW2_H #define BLOCK_QCOW2_H -#include "block/aes.h" +#include "qemu/aes.h" #include "block/coroutine.h" //#define DEBUG_ALLOC diff --git a/include/block/aes.h b/include/block/aes.h deleted file mode 100644 index a0167eb..0000000 --- a/include/block/aes.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef QEMU_AES_H -#define QEMU_AES_H - -#define AES_MAXNR 14 -#define AES_BLOCK_SIZE 16 - -struct aes_key_st { - uint32_t rd_key[4 *(AES_MAXNR + 1)]; - int rounds; -}; -typedef struct aes_key_st AES_KEY; - -int AES_set_encrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key); -int AES_set_decrypt_key(const unsigned char *userKey, const int bits, - AES_KEY *key); - -void AES_encrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key); -void AES_decrypt(const unsigned char *in, unsigned char *out, - const AES_KEY *key); -void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const AES_KEY *key, - unsigned char *ivec, const int enc); - -#endif diff --git a/include/qemu/aes.h b/include/qemu/aes.h new file mode 100644 index 0000000..a0167eb --- /dev/null +++ b/include/qemu/aes.h @@ -0,0 +1,26 @@ +#ifndef QEMU_AES_H +#define QEMU_AES_H + +#define AES_MAXNR 14 +#define AES_BLOCK_SIZE 16 + +struct aes_key_st { + uint32_t rd_key[4 *(AES_MAXNR + 1)]; + int rounds; +}; +typedef struct aes_key_st AES_KEY; + +int AES_set_encrypt_key(const unsigned char *userKey, const int bits, + AES_KEY *key); +int AES_set_decrypt_key(const unsigned char *userKey, const int bits, + AES_KEY *key); + +void AES_encrypt(const unsigned char *in, unsigned char *out, + const AES_KEY *key); +void AES_decrypt(const unsigned char *in, unsigned char *out, + const AES_KEY *key); +void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, + const unsigned long length, const AES_KEY *key, + unsigned char *ivec, const int enc); + +#endif diff --git a/util/aes.c b/util/aes.c index 1da7bff..54c7b98 100644 --- a/util/aes.c +++ b/util/aes.c @@ -28,7 +28,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "qemu-common.h" -#include "block/aes.h" +#include "qemu/aes.h" #ifndef NDEBUG #define NDEBUG