* [Qemu-devel] [PATCH for-2.10 01/19] crypto: cipher: introduce context free function
@ 2017-04-10 8:59 Longpeng(Mike)
2017-04-10 15:01 ` Eric Blake
0 siblings, 1 reply; 3+ messages in thread
From: Longpeng(Mike) @ 2017-04-10 8:59 UTC (permalink / raw)
To: berrange; +Cc: xuquan8, arei.gonglei, qemu-devel, Longpeng(Mike)
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.
Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
---
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 6487eca..0ecffa2 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 dfc9030..e04e3a1 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);
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.10 01/19] crypto: cipher: introduce context free function
2017-04-10 8:59 [Qemu-devel] [PATCH for-2.10 01/19] crypto: cipher: introduce context free function Longpeng(Mike)
@ 2017-04-10 15:01 ` Eric Blake
2017-04-11 1:05 ` Longpeng (Mike)
0 siblings, 1 reply; 3+ messages in thread
From: Eric Blake @ 2017-04-10 15:01 UTC (permalink / raw)
To: Longpeng(Mike), berrange; +Cc: xuquan8, arei.gonglei, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 694 bytes --]
On 04/10/2017 03:59 AM, Longpeng(Mike) wrote:
> Refactors the qcrypto_cipher_free(), splits it into two parts. One
> is gcrypt/nettle__cipher_free_ctx() to free the special context.
Your mail forgot to include 'In-Reply-To:' and 'References:' headers;
and therefore you resulted in sending 20 top-level threads instead of 19
replies to the 0/19 cover letter (the one with Message-ID:
<1491814997-58268-1-git-send-email-longpeng2@huawei.com>). Please fix
your setup for sending patch series, as it gets very hard to follow
improperly threaded series.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.10 01/19] crypto: cipher: introduce context free function
2017-04-10 15:01 ` Eric Blake
@ 2017-04-11 1:05 ` Longpeng (Mike)
0 siblings, 0 replies; 3+ messages in thread
From: Longpeng (Mike) @ 2017-04-11 1:05 UTC (permalink / raw)
To: Eric Blake; +Cc: berrange, xuquan8, arei.gonglei, qemu-devel
On 2017/4/10 23:01, Eric Blake wrote:
> On 04/10/2017 03:59 AM, Longpeng(Mike) wrote:
>> Refactors the qcrypto_cipher_free(), splits it into two parts. One
>> is gcrypt/nettle__cipher_free_ctx() to free the special context.
>
> Your mail forgot to include 'In-Reply-To:' and 'References:' headers;
> and therefore you resulted in sending 20 top-level threads instead of 19
> replies to the 0/19 cover letter (the one with Message-ID:
> <1491814997-58268-1-git-send-email-longpeng2@huawei.com>). Please fix
> your setup for sending patch series, as it gets very hard to follow
> improperly threaded series.
OK, I'll fix it. thx.
>
--
Regards,
Longpeng(Mike)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-11 1:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-10 8:59 [Qemu-devel] [PATCH for-2.10 01/19] crypto: cipher: introduce context free function Longpeng(Mike)
2017-04-10 15:01 ` Eric Blake
2017-04-11 1:05 ` Longpeng (Mike)
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.