| Message ID | 1492392806-53720-4-git-send-email-longpeng2@huawei.com |
|---|---|
| State | New |
| Headers | show |
> -----Original Message----- > From: longpeng > Sent: Monday, April 17, 2017 9:33 AM > To: berrange@redhat.com > Cc: Gonglei (Arei); Huangweidong (C); armbru@redhat.com; > eblake@redhat.com; mst@redhat.com; qemu-devel@nongnu.org; longpeng > Subject: [PATCH v2 for-2.10 03/18] crypto: cipher: introduce > qcrypto_cipher_ctx_new for nettle-backend > > Extracts qcrypto_cipher_ctx_new() from qcrypto_cipher_new() for > nettle-backend impls. > > Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com> > --- > crypto/cipher-nettle.c | 41 +++++++++++++++++++++++++++++------------ > 1 file changed, 29 insertions(+), 12 deletions(-) > Reviewed-by: Gonglei <arei.gonglei@huawei.com> > diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c > index e04e3a1..e6d6e6c 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; > +} > -- > 1.8.3.1 >
diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c index e04e3a1..e6d6e6c 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; +}
Extracts qcrypto_cipher_ctx_new() from qcrypto_cipher_new() for nettle-backend impls. Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com> --- crypto/cipher-nettle.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-)