From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG3MA-0005f6-A1 for qemu-devel@nongnu.org; Fri, 17 Jul 2015 06:59:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZG3M6-00075h-D2 for qemu-devel@nongnu.org; Fri, 17 Jul 2015 06:59:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG3M6-000750-5g for qemu-devel@nongnu.org; Fri, 17 Jul 2015 06:59:02 -0400 Date: Fri, 17 Jul 2015 11:58:57 +0100 From: "Daniel P. Berrange" Message-ID: <20150717105857.GH4835@redhat.com> References: <1437062641-12684-1-git-send-email-rkrcmar@redhat.com> <1437062641-12684-4-git-send-email-rkrcmar@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1437062641-12684-4-git-send-email-rkrcmar@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 3/3] crypto: use CPP for wrapper definitions in nettle Reply-To: "Daniel P. Berrange" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Radim =?utf-8?B?S3LEjW3DocWZ?= Cc: Peter Maydell , qemu-devel@nongnu.org On Thu, Jul 16, 2015 at 06:04:01PM +0200, Radim Kr=C4=8Dm=C3=A1=C5=99 wro= te: > It's horrible both ways and I prefer this one. >=20 > Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 As you say its ugly either way, but I think the amount of duplicated code pattern is not too bad, and IMHO it is slightly clearer to read without the macro usage. I won't object to merge if other people think this macro usage is worth while, but I don't think there's compelling need for it. > --- > v3: make wrappers 'static' > v2: new >=20 > crypto/cipher-nettle.c | 47 +++++++++++++++++-------------------------= ----- > 1 file changed, 17 insertions(+), 30 deletions(-) >=20 > diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c > index 3e3c4c9cbf2f..5a9d506560ae 100644 > --- a/crypto/cipher-nettle.c > +++ b/crypto/cipher-nettle.c > @@ -33,34 +33,21 @@ typedef const void * cipher_ctx_t; > typedef size_t cipher_length_t; > #endif > =20 > -static nettle_cipher_func aes_encrypt_wrapper; > -static nettle_cipher_func aes_decrypt_wrapper; > -static nettle_cipher_func des_encrypt_wrapper; > -static nettle_cipher_func des_decrypt_wrapper; > +#define WRAP(cipher) \ > + static nettle_cipher_func cipher##_wrapper; \ > + static void cipher##_wrapper(cipher_ctx_t ctx, cipher_length_t len= gth, \ > + uint8_t *dst, const uint8_t *src) \ > + { \ > + cipher(ctx, length, dst, src); \ > + } > =20 > -static void aes_encrypt_wrapper(cipher_ctx_t ctx, cipher_length_t leng= th, > - uint8_t *dst, const uint8_t *src) > -{ > - aes_encrypt(ctx, length, dst, src); > -} > +#define WRAPPED(cipher) \ > + cipher##_wrapper > =20 > -static void aes_decrypt_wrapper(cipher_ctx_t ctx, cipher_length_t leng= th, > - uint8_t *dst, const uint8_t *src) > -{ > - aes_encrypt(ctx, length, dst, src); > -} > - > -static void des_encrypt_wrapper(cipher_ctx_t ctx, cipher_length_t leng= th, > - uint8_t *dst, const uint8_t *src) > -{ > - des_encrypt(ctx, length, dst, src); > -} > - > -static void des_decrypt_wrapper(cipher_ctx_t ctx, cipher_length_t leng= th, > - uint8_t *dst, const uint8_t *src) > -{ > - des_decrypt(ctx, length, dst, src); > -} > +WRAP(aes_encrypt) > +WRAP(aes_decrypt) > +WRAP(des_encrypt) > +WRAP(des_decrypt) > =20 > typedef struct QCryptoCipherNettle QCryptoCipherNettle; > struct QCryptoCipherNettle { > @@ -122,8 +109,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgo= rithm alg, > des_set_key(ctx->ctx_encrypt, rfbkey); > g_free(rfbkey); > =20 > - ctx->alg_encrypt =3D des_encrypt_wrapper; > - ctx->alg_decrypt =3D des_decrypt_wrapper; > + ctx->alg_encrypt =3D WRAPPED(des_encrypt); > + ctx->alg_decrypt =3D WRAPPED(des_decrypt); > =20 > ctx->niv =3D DES_BLOCK_SIZE; > break; > @@ -137,8 +124,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgo= rithm alg, > aes_set_encrypt_key(ctx->ctx_encrypt, nkey, key); > aes_set_decrypt_key(ctx->ctx_decrypt, nkey, key); > =20 > - ctx->alg_encrypt =3D aes_encrypt_wrapper; > - ctx->alg_decrypt =3D aes_decrypt_wrapper; > + ctx->alg_encrypt =3D WRAPPED(aes_encrypt); > + ctx->alg_decrypt =3D WRAPPED(aes_decrypt); > =20 > ctx->niv =3D AES_BLOCK_SIZE; > break; Reviewed-by: Daniel P. Berrange Regards, Daniel --=20 |: http://berrange.com -o- http://www.flickr.com/photos/dberrange= / :| |: http://libvirt.org -o- http://virt-manager.or= g :| |: http://autobuild.org -o- http://search.cpan.org/~danberr= / :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vn= c :|