Commit 14a5a2ae authored by Longpeng(Mike)'s avatar Longpeng(Mike) Committed by Daniel P. Berrangé
Browse files

crypto: hmac: add hmac driver framework 



1) makes the public APIs in hmac-nettle/gcrypt/glib static,
   and rename them with "nettle/gcrypt/glib" prefix.

2) introduces hmac framework, including QCryptoHmacDriver
   and new public APIs.

Signed-off-by: default avatarLongpeng(Mike) <longpeng2@huawei.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent d73c04e3

crypto/hmac-gcrypt.c

+17 −34
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "crypto/hmac.h"

#include "hmacpriv.h"

#include <gcrypt.h>



static int qcrypto_hmac_alg_map[QCRYPTO_HASH_ALG__MAX] = {
@@ -42,8 +43,7 @@ bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg) 
    return false;

}



static QCryptoHmacGcrypt *

qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,

void *qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,

                           const uint8_t *key, size_t nkey,

                           Error **errp)

{
@@ -81,22 +81,19 @@ error: 
    return NULL;

}



void qcrypto_hmac_free(QCryptoHmac *hmac)

static void

qcrypto_gcrypt_hmac_ctx_free(QCryptoHmac *hmac)

{

    QCryptoHmacGcrypt *ctx;



    if (!hmac) {

        return;

    }



    ctx = hmac->opaque;

    gcry_mac_close(ctx->handle);



    g_free(ctx);

    g_free(hmac);

}



int qcrypto_hmac_bytesv(QCryptoHmac *hmac,

static int

qcrypto_gcrypt_hmac_bytesv(QCryptoHmac *hmac,

                           const struct iovec *iov,

                           size_t niov,

                           uint8_t **result,
@@ -147,21 +144,7 @@ int qcrypto_hmac_bytesv(QCryptoHmac *hmac, 
    return 0;

}



QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,

                              const uint8_t *key, size_t nkey,

                              Error **errp)

{

    QCryptoHmac *hmac;

    QCryptoHmacGcrypt *ctx;



    ctx = qcrypto_hmac_ctx_new(alg, key, nkey, errp);

    if (!ctx) {

        return NULL;

    }



    hmac = g_new0(QCryptoHmac, 1);

    hmac->alg = alg;

    hmac->opaque = ctx;



    return hmac;

}
 
QCryptoHmacDriver qcrypto_hmac_lib_driver = {

    .hmac_bytesv = qcrypto_gcrypt_hmac_bytesv,

    .hmac_free = qcrypto_gcrypt_hmac_ctx_free,

};

crypto/hmac-glib.c

+30 −45
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "crypto/hmac.h"

#include "hmacpriv.h"



/* Support for HMAC Algos has been added in GLib 2.30 */

#if GLIB_CHECK_VERSION(2, 30, 0)
@@ -49,8 +50,7 @@ bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg) 
    return false;

}



static QCryptoHmacGlib *

qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,

void *qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,

                           const uint8_t *key, size_t nkey,

                           Error **errp)

{
@@ -78,22 +78,19 @@ error: 
    return NULL;

}



void qcrypto_hmac_free(QCryptoHmac *hmac)

static void

qcrypto_glib_hmac_ctx_free(QCryptoHmac *hmac)

{

    QCryptoHmacGlib *ctx;



    if (!hmac) {

        return;

    }



    ctx = hmac->opaque;

    g_hmac_unref(ctx->ghmac);



    g_free(ctx);

    g_free(hmac);

}



int qcrypto_hmac_bytesv(QCryptoHmac *hmac,

static int

qcrypto_glib_hmac_bytesv(QCryptoHmac *hmac,

                         const struct iovec *iov,

                         size_t niov,

                         uint8_t **result,
@@ -129,25 +126,6 @@ int qcrypto_hmac_bytesv(QCryptoHmac *hmac, 
    return 0;

}



QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,

                              const uint8_t *key, size_t nkey,

                              Error **errp)

{

    QCryptoHmac *hmac;

    QCryptoHmacGlib *ctx;



    ctx = qcrypto_hmac_ctx_new(alg, key, nkey, errp);

    if (!ctx) {

        return NULL;

    }



    hmac = g_new0(QCryptoHmac, 1);

    hmac->alg = alg;

    hmac->opaque = ctx;



    return hmac;

}



#else



bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg)
@@ -155,19 +133,21 @@ bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg) 
    return false;

}



QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,

void *qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,

                           const uint8_t *key, size_t nkey,

                           Error **errp)

{

    return NULL;

}



void qcrypto_hmac_free(QCryptoHmac *hmac)

static void

qcrypto_glib_hmac_ctx_free(QCryptoHmac *hmac)

{

    return;

}



int qcrypto_hmac_bytesv(QCryptoHmac *hmac,

static int

qcrypto_glib_hmac_bytesv(QCryptoHmac *hmac,

                         const struct iovec *iov,

                         size_t niov,

                         uint8_t **result,
@@ -178,3 +158,8 @@ int qcrypto_hmac_bytesv(QCryptoHmac *hmac, 
}



#endif



QCryptoHmacDriver qcrypto_hmac_lib_driver = {

    .hmac_bytesv = qcrypto_glib_hmac_bytesv,

    .hmac_free = qcrypto_glib_hmac_ctx_free,

};

crypto/hmac-nettle.c

+17 −35
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "crypto/hmac.h"

#include "hmacpriv.h"

#include <nettle/hmac.h>



typedef void (*qcrypto_nettle_hmac_setkey)(void *ctx,
@@ -97,8 +98,7 @@ bool qcrypto_hmac_supports(QCryptoHashAlgorithm alg) 
    return false;

}



static QCryptoHmacNettle *

qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,

void *qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,

                           const uint8_t *key, size_t nkey,

                           Error **errp)

{
@@ -117,21 +117,17 @@ qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg, 
    return ctx;

}



void qcrypto_hmac_free(QCryptoHmac *hmac)

static void

qcrypto_nettle_hmac_ctx_free(QCryptoHmac *hmac)

{

    QCryptoHmacNettle *ctx;



    if (!hmac) {

        return;

    }



    ctx = hmac->opaque;



    g_free(ctx);

    g_free(hmac);

}



int qcrypto_hmac_bytesv(QCryptoHmac *hmac,

static int

qcrypto_nettle_hmac_bytesv(QCryptoHmac *hmac,

                           const struct iovec *iov,

                           size_t niov,

                           uint8_t **result,
@@ -169,21 +165,7 @@ int qcrypto_hmac_bytesv(QCryptoHmac *hmac, 
    return 0;

}



QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,

                              const uint8_t *key, size_t nkey,

                              Error **errp)

{

    QCryptoHmac *hmac;

    QCryptoHmacNettle *ctx;



    ctx = qcrypto_hmac_ctx_new(alg, key, nkey, errp);

    if (!ctx) {

        return NULL;

    }



    hmac = g_new0(QCryptoHmac, 1);

    hmac->alg = alg;

    hmac->opaque = ctx;



    return hmac;

}
 
QCryptoHmacDriver qcrypto_hmac_lib_driver = {

    .hmac_bytesv = qcrypto_nettle_hmac_bytesv,

    .hmac_free = qcrypto_nettle_hmac_ctx_free,

};

crypto/hmac.c

+44 −0
Original line number Diff line number Diff line
@@ -12,9 +12,22 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "crypto/hmac.h"

#include "hmacpriv.h"



static const char hex[] = "0123456789abcdef";



int qcrypto_hmac_bytesv(QCryptoHmac *hmac,

                        const struct iovec *iov,

                        size_t niov,

                        uint8_t **result,

                        size_t *resultlen,

                        Error **errp)

{

    QCryptoHmacDriver *drv = hmac->driver;



    return drv->hmac_bytesv(hmac, iov, niov, result, resultlen, errp);

}



int qcrypto_hmac_bytes(QCryptoHmac *hmac,

                       const char *buf,

                       size_t len,
@@ -70,3 +83,34 @@ int qcrypto_hmac_digest(QCryptoHmac *hmac, 


    return qcrypto_hmac_digestv(hmac, &iov, 1, digest, errp);

}



QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg,

                              const uint8_t *key, size_t nkey,

                              Error **errp)

{

    QCryptoHmac *hmac;

    void *ctx;



    ctx = qcrypto_hmac_ctx_new(alg, key, nkey, errp);

    if (!ctx) {

        return NULL;

    }



    hmac = g_new0(QCryptoHmac, 1);

    hmac->alg = alg;

    hmac->opaque = ctx;

    hmac->driver = (void *)&qcrypto_hmac_lib_driver;



    return hmac;

}



void qcrypto_hmac_free(QCryptoHmac *hmac)

{

    QCryptoHmacDriver *drv;



    if (hmac) {

        drv = hmac->driver;

        drv->hmac_free(hmac);

        g_free(hmac);

    }

}

crypto/hmacpriv.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * QEMU Crypto hmac driver supports

 *

 * Copyright (c) 2017 HUAWEI TECHNOLOGIES CO., LTD.

 *

 * Authors:

 *    Longpeng(Mike) <longpeng2@huawei.com>

 *

 * 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.

 *

 */



#ifndef QCRYPTO_HMACPRIV_H

#define QCRYPTO_HMACPRIV_H



typedef struct QCryptoHmacDriver QCryptoHmacDriver;



struct QCryptoHmacDriver {

    int (*hmac_bytesv)(QCryptoHmac *hmac,

                       const struct iovec *iov,

                       size_t niov,

                       uint8_t **result,

                       size_t *resultlen,

                       Error **errp);



    void (*hmac_free)(QCryptoHmac *hmac);

};



extern void *qcrypto_hmac_ctx_new(QCryptoHashAlgorithm alg,

                                  const uint8_t *key, size_t nkey,

                                  Error **errp);

extern QCryptoHmacDriver qcrypto_hmac_lib_driver;



#endif