[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 03/18] crypto: cipher: introduce qcrypto_cipher_ct
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 03/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for nettle-backend |
Date: |
Tue, 18 Jul 2017 11:25:04 +0100 |
From: "Longpeng(Mike)" <address@hidden>
Extracts qcrypto_cipher_ctx_new() from qcrypto_cipher_new() for
nettle-backend impls.
Reviewed-by: Gonglei <address@hidden>
Signed-off-by: Longpeng(Mike) <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
crypto/cipher-nettle.c | 41 +++++++++++++++++++++++++++++------------
1 file changed, 29 insertions(+), 12 deletions(-)
diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c
index e04e3a1c30..e6d6e6cb69 100644
--- a/crypto/cipher-nettle.c
+++ b/crypto/cipher-nettle.c
@@ -262,12 +262,12 @@ static void nettle_cipher_free_ctx(QCryptoCipherNettle
*ctx)
}
-QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
- QCryptoCipherMode mode,
- const uint8_t *key, size_t nkey,
- Error **errp)
+static QCryptoCipherNettle *qcrypto_cipher_ctx_new(QCryptoCipherAlgorithm alg,
+ QCryptoCipherMode mode,
+ const uint8_t *key,
+ size_t nkey,
+ Error **errp)
{
- QCryptoCipher *cipher;
QCryptoCipherNettle *ctx;
uint8_t *rfbkey;
@@ -287,12 +287,7 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm
alg,
return NULL;
}
- cipher = g_new0(QCryptoCipher, 1);
- cipher->alg = alg;
- cipher->mode = mode;
-
ctx = g_new0(QCryptoCipherNettle, 1);
- cipher->opaque = ctx;
switch (alg) {
case QCRYPTO_CIPHER_ALG_DES_RFB:
@@ -436,10 +431,10 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm
alg,
ctx->iv = g_new0(uint8_t, ctx->blocksize);
- return cipher;
+ return ctx;
error:
- qcrypto_cipher_free(cipher);
+ nettle_cipher_free_ctx(ctx);
return NULL;
}
@@ -561,3 +556,25 @@ int qcrypto_cipher_setiv(QCryptoCipher *cipher,
memcpy(ctx->iv, iv, niv);
return 0;
}
+
+
+QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
+ QCryptoCipherMode mode,
+ const uint8_t *key, size_t nkey,
+ Error **errp)
+{
+ QCryptoCipher *cipher;
+ QCryptoCipherNettle *ctx;
+
+ ctx = qcrypto_cipher_ctx_new(alg, mode, key, nkey, errp);
+ if (!ctx) {
+ return NULL;
+ }
+
+ cipher = g_new0(QCryptoCipher, 1);
+ cipher->alg = alg;
+ cipher->mode = mode;
+ cipher->opaque = ctx;
+
+ return cipher;
+}
--
2.13.0
- [Qemu-devel] [PULL v1 00/18] Merge crypto 201/07/18, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 01/18] crypto: cipher: introduce context free function, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 02/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for gcrypt-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 03/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for nettle-backend,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 04/18] crypto: cipher: introduce qcrypto_cipher_ctx_new for builtin-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 05/18] crypto: cipher: add cipher driver framework, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 06/18] crypto: hash: add hash driver framework, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 10/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for glib-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 08/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for gcrypt-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 09/18] crypto: hmac: introduce qcrypto_hmac_ctx_new for nettle-backend, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 07/18] crypto: hmac: move crypto/hmac.h into include/crypto/, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 11/18] crypto: hmac: add hmac driver framework, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 13/18] crypto: cipher: add afalg-backend cipher support, Daniel P. Berrange, 2017/07/18
- [Qemu-devel] [PULL v1 12/18] crypto: introduce some common functions for af_alg backend, Daniel P. Berrange, 2017/07/18