[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/17] crypto: Remove redundant includes
From: |
Daniel P . Berrangé |
Subject: |
[PULL 04/17] crypto: Remove redundant includes |
Date: |
Thu, 10 Sep 2020 11:06:10 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
Both qemu/osdep.h and cipherpriv.h have already been
included by the parent cipher.c.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
crypto/cipher-builtin.c.inc | 2 --
crypto/cipher-gcrypt.c.inc | 2 --
crypto/cipher-nettle.c.inc | 2 --
3 files changed, 6 deletions(-)
diff --git a/crypto/cipher-builtin.c.inc b/crypto/cipher-builtin.c.inc
index 6eafd39da0..56d45b0227 100644
--- a/crypto/cipher-builtin.c.inc
+++ b/crypto/cipher-builtin.c.inc
@@ -18,11 +18,9 @@
*
*/
-#include "qemu/osdep.h"
#include "crypto/aes.h"
#include "crypto/desrfb.h"
#include "crypto/xts.h"
-#include "cipherpriv.h"
typedef struct QCryptoCipherBuiltinAESContext QCryptoCipherBuiltinAESContext;
struct QCryptoCipherBuiltinAESContext {
diff --git a/crypto/cipher-gcrypt.c.inc b/crypto/cipher-gcrypt.c.inc
index 81e4745bff..a62839914b 100644
--- a/crypto/cipher-gcrypt.c.inc
+++ b/crypto/cipher-gcrypt.c.inc
@@ -18,11 +18,9 @@
*
*/
-#include "qemu/osdep.h"
#ifdef CONFIG_QEMU_PRIVATE_XTS
#include "crypto/xts.h"
#endif
-#include "cipherpriv.h"
#include <gcrypt.h>
diff --git a/crypto/cipher-nettle.c.inc b/crypto/cipher-nettle.c.inc
index 0677fdfd33..256931a823 100644
--- a/crypto/cipher-nettle.c.inc
+++ b/crypto/cipher-nettle.c.inc
@@ -18,11 +18,9 @@
*
*/
-#include "qemu/osdep.h"
#ifdef CONFIG_QEMU_PRIVATE_XTS
#include "crypto/xts.h"
#endif
-#include "cipherpriv.h"
#include <nettle/nettle-types.h>
#include <nettle/aes.h>
--
2.26.2
- [PULL 00/17] Crypto next patches, Daniel P . Berrangé, 2020/09/10
- [PULL 01/17] tests: fix output message formatting for crypto benchmarks, Daniel P . Berrangé, 2020/09/10
- [PULL 02/17] crypto: Assume blocksize is a power of 2, Daniel P . Berrangé, 2020/09/10
- [PULL 03/17] crypto: Rename cipher include files to .c.inc, Daniel P . Berrangé, 2020/09/10
- [PULL 04/17] crypto: Remove redundant includes,
Daniel P . Berrangé <=
- [PULL 05/17] crypto/nettle: Fix xts_encrypt arguments, Daniel P . Berrangé, 2020/09/10
- [PULL 06/17] crypto: Move QCryptoCipherDriver typedef to crypto/cipher.h, Daniel P . Berrangé, 2020/09/10
- [PULL 07/17] crypto: Use the correct const type for driver, Daniel P . Berrangé, 2020/09/10
- [PULL 08/17] crypto: Allocate QCryptoCipher with the subclass, Daniel P . Berrangé, 2020/09/10
- [PULL 09/17] crypto: Move cipher->driver init to qcrypto_*_cipher_ctx_new, Daniel P . Berrangé, 2020/09/10
- [PULL 11/17] crypto/builtin: Remove odd-sized AES block handling, Daniel P . Berrangé, 2020/09/10
- [PULL 12/17] crypto/builtin: Merge qcrypto_cipher_aes_{ecb, xts}_{en, de}crypt, Daniel P . Berrangé, 2020/09/10
- [PULL 10/17] crypto: Constify cipher data tables, Daniel P . Berrangé, 2020/09/10
- [PULL 13/17] crypto/builtin: Move AES_cbc_encrypt into cipher-builtin.inc.c, Daniel P . Berrangé, 2020/09/10
- [PULL 14/17] crypto/builtin: Split and simplify AES_encrypt_cbc, Daniel P . Berrangé, 2020/09/10