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

crypto: hash: add hash driver framework 



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

2) introduces hash framework, including QCryptoHashDriver
   and new public APIs.

Reviewed-by: default avatarGonglei <arei.gonglei@huawei.com>
Signed-off-by: default avatarLongpeng(Mike) <longpeng2@huawei.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent 75c80078

crypto/hash-gcrypt.c

+13 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <gcrypt.h>

#include "qapi/error.h"

#include "crypto/hash.h"

#include "hashpriv.h"





static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
@@ -44,7 +45,8 @@ gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg) 
}





int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,

static int

qcrypto_gcrypt_hash_bytesv(QCryptoHashAlgorithm alg,

                           const struct iovec *iov,

                           size_t niov,

                           uint8_t **result,
@@ -107,3 +109,8 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg, 
    gcry_md_close(md);

    return -1;

}





QCryptoHashDriver qcrypto_hash_lib_driver = {

    .hash_bytesv = qcrypto_gcrypt_hash_bytesv,

};

crypto/hash-glib.c

+13 −6
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "crypto/hash.h"

#include "hashpriv.h"





static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
@@ -47,7 +48,8 @@ gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg) 
}





int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,

static int

qcrypto_glib_hash_bytesv(QCryptoHashAlgorithm alg,

                         const struct iovec *iov,

                         size_t niov,

                         uint8_t **result,
@@ -95,3 +97,8 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg, 
    g_checksum_free(cs);

    return -1;

}





QCryptoHashDriver qcrypto_hash_lib_driver = {

    .hash_bytesv = qcrypto_glib_hash_bytesv,

};

crypto/hash-nettle.c

+13 −6
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "crypto/hash.h"

#include "hashpriv.h"

#include <nettle/md5.h>

#include <nettle/sha.h>

#include <nettle/ripemd160.h>
@@ -103,7 +104,8 @@ gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg) 
}





int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,

static int

qcrypto_nettle_hash_bytesv(QCryptoHashAlgorithm alg,

                           const struct iovec *iov,

                           size_t niov,

                           uint8_t **result,
@@ -152,3 +154,8 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg, 


    return 0;

}





QCryptoHashDriver qcrypto_hash_lib_driver = {

    .hash_bytesv = qcrypto_nettle_hash_bytesv,

};

crypto/hash.c

+13 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "crypto/hash.h"

#include "hashpriv.h"



static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = {

    [QCRYPTO_HASH_ALG_MD5] = 16,
@@ -38,6 +39,18 @@ size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg) 
    return qcrypto_hash_alg_size[alg];

}



int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,

                        const struct iovec *iov,

                        size_t niov,

                        uint8_t **result,

                        size_t *resultlen,

                        Error **errp)

{

    return qcrypto_hash_lib_driver.hash_bytesv(alg, iov, niov,

                                               result, resultlen,

                                               errp);

}





int qcrypto_hash_bytes(QCryptoHashAlgorithm alg,

                       const char *buf,

crypto/hashpriv.h

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

 * QEMU Crypto hash 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_HASHPRIV_H

#define QCRYPTO_HASHPRIV_H



typedef struct QCryptoHashDriver QCryptoHashDriver;



struct QCryptoHashDriver {

    int (*hash_bytesv)(QCryptoHashAlgorithm alg,

                       const struct iovec *iov,

                       size_t niov,

                       uint8_t **result,

                       size_t *resultlen,

                       Error **errp);

};



extern QCryptoHashDriver qcrypto_hash_lib_driver;



#endif