Re: [Qemu-devel] [PATCH v4 13/18] crypto: cipher: add afalg-backend cipher support

[Daniel P. Berrange]

On Tue, Jul 11, 2017 at 01:20:35PM +0100, Daniel P. Berrange wrote:
> On Tue, Jul 04, 2017 at 04:57:05PM +0800, Longpeng(Mike) wrote:
> > Adds afalg-backend cipher support: introduces some private APIs
> > firstly, and then intergrates them into qcrypto_cipher_afalg_driver.
> > 
> > Signed-off-by: Longpeng(Mike) <address@hidden>
> > ---
> >  crypto/Makefile.objs  |   1 +
> >  crypto/afalgpriv.h    |   9 ++
> >  crypto/cipher-afalg.c | 223 
> > ++++++++++++++++++++++++++++++++++++++++++++++++++
> >  crypto/cipher.c       |  23 +++++-
> >  crypto/cipherpriv.h   |  16 ++++
> >  5 files changed, 268 insertions(+), 4 deletions(-)
> >  create mode 100644 crypto/cipher-afalg.c
> > 
> > diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
> > index 2be5a3a..d2e8fa8 100644
> > --- a/crypto/Makefile.objs
> > +++ b/crypto/Makefile.objs
> > @@ -11,6 +11,7 @@ crypto-obj-y += aes.o
> >  crypto-obj-y += desrfb.o
> >  crypto-obj-y += cipher.o
> >  crypto-obj-$(CONFIG_AF_ALG) += afalg.o
> > +crypto-obj-$(CONFIG_AF_ALG) += cipher-afalg.o
> >  crypto-obj-y += tlscreds.o
> >  crypto-obj-y += tlscredsanon.o
> >  crypto-obj-y += tlscredsx509.o
> > diff --git a/crypto/afalgpriv.h b/crypto/afalgpriv.h
> > index d21160c..a4a7b97 100644
> > --- a/crypto/afalgpriv.h
> > +++ b/crypto/afalgpriv.h
> > @@ -19,6 +19,15 @@
> >  #define SALG_TYPE_LEN_MAX 14
> >  #define SALG_NAME_LEN_MAX 64
> >  
> > +#ifndef SOL_ALG
> > +#define SOL_ALG 279
> > +#endif
> > +
> > +#define AFALG_TYPE_CIPHER "skcipher"
> > +
> > +#define ALG_OPTYPE_LEN 4
> > +#define ALG_MSGIV_LEN(len) (sizeof(struct af_alg_iv) + (len))
> > +
> >  typedef struct QCryptoAFAlg QCryptoAFAlg;
> >  
> >  struct QCryptoAFAlg {
> > diff --git a/crypto/cipher-afalg.c b/crypto/cipher-afalg.c
> > new file mode 100644
> > index 0000000..c5d1d5d
> > --- /dev/null
> > +++ b/crypto/cipher-afalg.c
> > @@ -0,0 +1,223 @@
> > +/*
> > + * QEMU Crypto af_alg-backend cipher support
> > + *
> > + * Copyright (c) 2017 HUAWEI TECHNOLOGIES CO., LTD.
> > + *
> > + * Authors:
> > + *    Longpeng(Mike) <address@hidden>
> > + *
> > + * This work is licensed under the terms of the GNU GPL, version 2 or
> > + * (at your option) any later version.  See the COPYING file in the
> > + * top-level directory.
> > + */
> > +#include "qemu/osdep.h"
> > +#include "qemu/sockets.h"
> > +#include "qemu-common.h"
> > +#include "qapi/error.h"
> > +#include "crypto/cipher.h"
> > +#include "cipherpriv.h"
> > +
> > +
> > +static char *
> > +qcrypto_afalg_cipher_format_name(QCryptoCipherAlgorithm alg,
> > +                                 QCryptoCipherMode mode,
> > +                                 Error **errp)
> > +{
> > +    char *name;
> > +    const char *alg_name;
> > +    const char *mode_name;
> > +
> > +    switch (alg) {
> > +    case QCRYPTO_CIPHER_ALG_AES_128:
> > +    case QCRYPTO_CIPHER_ALG_AES_192:
> > +    case QCRYPTO_CIPHER_ALG_AES_256:
> > +        alg_name = "aes";
> > +        break;
> > +    case QCRYPTO_CIPHER_ALG_CAST5_128:
> > +        alg_name = "cast5";
> > +        break;
> > +    case QCRYPTO_CIPHER_ALG_SERPENT_128:
> > +    case QCRYPTO_CIPHER_ALG_SERPENT_192:
> > +    case QCRYPTO_CIPHER_ALG_SERPENT_256:
> > +        alg_name = "serpent";
> > +        break;
> > +    case QCRYPTO_CIPHER_ALG_TWOFISH_128:
> > +    case QCRYPTO_CIPHER_ALG_TWOFISH_192:
> > +    case QCRYPTO_CIPHER_ALG_TWOFISH_256:
> > +        alg_name = "twofish";
> > +        break;
> > +
> > +    default:
> > +        error_setg(errp, "Unsupported cipher algorithm %d", alg);
> > +        return NULL;
> > +    }
> > +
> > +    mode_name = QCryptoCipherMode_lookup[mode];
> > +    name = g_strdup_printf("%s(%s)", mode_name, alg_name);
> > +
> > +    return name;
> > +}
> > +
> > +QCryptoAFAlg *
> > +qcrypto_afalg_cipher_ctx_new(QCryptoCipherAlgorithm alg,
> > +                             QCryptoCipherMode mode,
> > +                             const uint8_t *key,
> > +                             size_t nkey, Error **errp)
> > +{
> > +    QCryptoAFAlg *afalg;
> > +    size_t expect_niv;
> > +    char *name;
> > +
> > +    name = qcrypto_afalg_cipher_format_name(alg, mode, errp);
> > +    if (!name) {
> > +        return NULL;
> > +    }
> > +
> > +    afalg = qcrypto_afalg_comm_alloc(AFALG_TYPE_CIPHER, name, errp);
> > +    if (!afalg) {
> > +        g_free(name);
> > +        return NULL;
> > +    }
> > +    afalg->name = name;
> 
> How about moving the qcrypto_afalg_cipher_format_name() method into the
> afalg.c file. THen instead of passing 'name' into qcrypto_afalg_comm_alloc,
> you can just pass 'alg' & 'mode'.  Then qcrypto_afalg_comm_alloc can be
> responsible for setting afalg->name too.

Oh actually ignore this. I've just remembered that qcrypto_afalg_comm_alloc
method is used for multiple places, so we can't pass in alg & mode directly.

We can however make qcrypto_afalg_comm_alloc initializet he 'afalg->name'
field.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|