[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 01/18] crypto: cipher: introduce context free func
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v2 01/18] crypto: cipher: introduce context free function |
Date: |
Wed, 19 Jul 2017 10:15:43 +0100 |
From: "Longpeng(Mike)" <address@hidden>
Refactors the qcrypto_cipher_free(), splits it into two parts. One
is gcrypt/nettle__cipher_free_ctx() to free the special context.
This makes code more clear, what's more, it would be used by the
later patch.
Reviewed-by: Gonglei <address@hidden>
Signed-off-by: Longpeng(Mike) <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
crypto/cipher-gcrypt.c | 31 ++++++++++++++++++-------------
crypto/cipher-nettle.c | 18 ++++++++++++++----
2 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/crypto/cipher-gcrypt.c b/crypto/cipher-gcrypt.c
index 6487ecaf37..0ecffa2751 100644
--- a/crypto/cipher-gcrypt.c
+++ b/crypto/cipher-gcrypt.c
@@ -64,6 +64,22 @@ struct QCryptoCipherGcrypt {
uint8_t *iv;
};
+static void gcrypt_cipher_free_ctx(QCryptoCipherGcrypt *ctx,
+ QCryptoCipherMode mode)
+{
+ if (!ctx) {
+ return;
+ }
+
+ gcry_cipher_close(ctx->handle);
+ if (mode == QCRYPTO_CIPHER_MODE_XTS) {
+ gcry_cipher_close(ctx->tweakhandle);
+ }
+ g_free(ctx->iv);
+ g_free(ctx);
+}
+
+
QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
QCryptoCipherMode mode,
const uint8_t *key, size_t nkey,
@@ -228,11 +244,7 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm
alg,
return cipher;
error:
- gcry_cipher_close(ctx->handle);
- if (cipher->mode == QCRYPTO_CIPHER_MODE_XTS) {
- gcry_cipher_close(ctx->tweakhandle);
- }
- g_free(ctx);
+ gcrypt_cipher_free_ctx(ctx, mode);
g_free(cipher);
return NULL;
}
@@ -240,17 +252,10 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm
alg,
void qcrypto_cipher_free(QCryptoCipher *cipher)
{
- QCryptoCipherGcrypt *ctx;
if (!cipher) {
return;
}
- ctx = cipher->opaque;
- gcry_cipher_close(ctx->handle);
- if (cipher->mode == QCRYPTO_CIPHER_MODE_XTS) {
- gcry_cipher_close(ctx->tweakhandle);
- }
- g_free(ctx->iv);
- g_free(ctx);
+ gcrypt_cipher_free_ctx(cipher->opaque, cipher->mode);
g_free(cipher);
}
diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c
index dfc9030227..e04e3a1c30 100644
--- a/crypto/cipher-nettle.c
+++ b/crypto/cipher-nettle.c
@@ -249,6 +249,19 @@ bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg,
}
+static void nettle_cipher_free_ctx(QCryptoCipherNettle *ctx)
+{
+ if (!ctx) {
+ return;
+ }
+
+ g_free(ctx->iv);
+ g_free(ctx->ctx);
+ g_free(ctx->ctx_tweak);
+ g_free(ctx);
+}
+
+
QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
QCryptoCipherMode mode,
const uint8_t *key, size_t nkey,
@@ -440,10 +453,7 @@ void qcrypto_cipher_free(QCryptoCipher *cipher)
}
ctx = cipher->opaque;
- g_free(ctx->iv);
- g_free(ctx->ctx);
- g_free(ctx->ctx_tweak);
- g_free(ctx);
+ nettle_cipher_free_ctx(ctx);
g_free(cipher);
}
--
2.13.0
- [Qemu-devel] [PULL v2 00/18] Merge crypto 201/07/18, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 02/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for gcrypt-backend, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 01/18] crypto: cipher: introduce context free function,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v2 03/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for nettle-backend, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 04/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for builtin-backend, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 05/18] crypto: cipher: add cipher driver framework, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 06/18] crypto: hash: add hash driver framework, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 07/18] crypto: hmac: move crypto/hmac.h into include/crypto/, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 09/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for nettle-backend, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 08/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for gcrypt-backend, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 10/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for glib-backend, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 12/18] crypto: introduce some common functions for af_alg backend, Daniel P. Berrange, 2017/07/19
- [Qemu-devel] [PULL v2 11/18] crypto: hmac: add hmac driver framework, Daniel P. Berrange, 2017/07/19