diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/block-luks.h | 6 | ||||
| -rw-r--r-- | crypto/block-qcow.h | 6 | ||||
| -rw-r--r-- | crypto/blockpriv.h | 6 | ||||
| -rw-r--r-- | crypto/hash-gcrypt.c | 2 | ||||
| -rw-r--r-- | crypto/ivgenpriv.h | 6 | ||||
| -rw-r--r-- | crypto/pbkdf-gcrypt.c | 2 | ||||
| -rw-r--r-- | crypto/pbkdf-nettle.c | 2 | ||||
| -rw-r--r-- | crypto/tlscredspriv.h | 7 |
8 files changed, 18 insertions, 19 deletions
diff --git a/crypto/block-luks.h b/crypto/block-luks.h index 0934138aaa..b2d8a35c1b 100644 --- a/crypto/block-luks.h +++ b/crypto/block-luks.h @@ -18,11 +18,11 @@ * */ -#ifndef QCRYPTO_BLOCK_LUKS_H__ -#define QCRYPTO_BLOCK_LUKS_H__ +#ifndef QCRYPTO_BLOCK_LUKS_H +#define QCRYPTO_BLOCK_LUKS_H #include "crypto/blockpriv.h" extern const QCryptoBlockDriver qcrypto_block_driver_luks; -#endif /* QCRYPTO_BLOCK_LUKS_H__ */ +#endif /* QCRYPTO_BLOCK_LUKS_H */ diff --git a/crypto/block-qcow.h b/crypto/block-qcow.h index 569f836100..3e2c0a851a 100644 --- a/crypto/block-qcow.h +++ b/crypto/block-qcow.h @@ -18,11 +18,11 @@ * */ -#ifndef QCRYPTO_BLOCK_QCOW_H__ -#define QCRYPTO_BLOCK_QCOW_H__ +#ifndef QCRYPTO_BLOCK_QCOW_H +#define QCRYPTO_BLOCK_QCOW_H #include "crypto/blockpriv.h" extern const QCryptoBlockDriver qcrypto_block_driver_qcow; -#endif /* QCRYPTO_BLOCK_QCOW_H__ */ +#endif /* QCRYPTO_BLOCK_QCOW_H */ diff --git a/crypto/blockpriv.h b/crypto/blockpriv.h index 62970859d0..15b547d952 100644 --- a/crypto/blockpriv.h +++ b/crypto/blockpriv.h @@ -18,8 +18,8 @@ * */ -#ifndef QCRYPTO_BLOCK_PRIV_H__ -#define QCRYPTO_BLOCK_PRIV_H__ +#ifndef QCRYPTO_BLOCKPRIV_H +#define QCRYPTO_BLOCKPRIV_H #include "crypto/block.h" @@ -89,4 +89,4 @@ int qcrypto_block_encrypt_helper(QCryptoCipher *cipher, size_t len, Error **errp); -#endif /* QCRYPTO_BLOCK_PRIV_H__ */ +#endif /* QCRYPTO_BLOCKPRIV_H */ diff --git a/crypto/hash-gcrypt.c b/crypto/hash-gcrypt.c index 8ea5aff4ee..ed6f842461 100644 --- a/crypto/hash-gcrypt.c +++ b/crypto/hash-gcrypt.c @@ -19,9 +19,9 @@ */ #include "qemu/osdep.h" +#include <gcrypt.h> #include "qapi/error.h" #include "crypto/hash.h" -#include "gcrypt.h" static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = { diff --git a/crypto/ivgenpriv.h b/crypto/ivgenpriv.h index 7b87e02ea7..28e5c67383 100644 --- a/crypto/ivgenpriv.h +++ b/crypto/ivgenpriv.h @@ -18,8 +18,8 @@ * */ -#ifndef QCRYPTO_IVGEN_PRIV_H__ -#define QCRYPTO_IVGEN_PRIV_H__ +#ifndef QCRYPTO_IVGENPRIV_H +#define QCRYPTO_IVGENPRIV_H #include "crypto/ivgen.h" @@ -46,4 +46,4 @@ struct QCryptoIVGen { }; -#endif /* QCRYPTO_IVGEN_PRIV_H__ */ +#endif /* QCRYPTO_IVGENPRIV_H */ diff --git a/crypto/pbkdf-gcrypt.c b/crypto/pbkdf-gcrypt.c index 997b311d84..34af3a97e9 100644 --- a/crypto/pbkdf-gcrypt.c +++ b/crypto/pbkdf-gcrypt.c @@ -19,9 +19,9 @@ */ #include "qemu/osdep.h" +#include <gcrypt.h> #include "qapi/error.h" #include "crypto/pbkdf.h" -#include "gcrypt.h" bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash) { diff --git a/crypto/pbkdf-nettle.c b/crypto/pbkdf-nettle.c index db9fc15780..d681a606f9 100644 --- a/crypto/pbkdf-nettle.c +++ b/crypto/pbkdf-nettle.c @@ -19,9 +19,9 @@ */ #include "qemu/osdep.h" +#include <nettle/pbkdf2.h> #include "qapi/error.h" #include "crypto/pbkdf.h" -#include "nettle/pbkdf2.h" bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash) diff --git a/crypto/tlscredspriv.h b/crypto/tlscredspriv.h index 9222be4a9e..13e9b6c0b2 100644 --- a/crypto/tlscredspriv.h +++ b/crypto/tlscredspriv.h @@ -18,8 +18,8 @@ * */ -#ifndef QCRYPTO_TLSCRED_PRIV_H__ -#define QCRYPTO_TLSCRED_PRIV_H__ +#ifndef QCRYPTO_TLSCREDSPRIV_H +#define QCRYPTO_TLSCREDSPRIV_H #include "crypto/tlscreds.h" @@ -38,5 +38,4 @@ int qcrypto_tls_creds_get_dh_params_file(QCryptoTLSCreds *creds, #endif -#endif /* QCRYPTO_TLSCRED_PRIV_H__ */ - +#endif /* QCRYPTO_TLSCREDSPRIV_H */ |