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: Gonglei <arei.gonglei@huawei.com> Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
75c8007809
commit
aa8efad903
|
@ -22,6 +22,7 @@
|
||||||
#include <gcrypt.h>
|
#include <gcrypt.h>
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "crypto/hash.h"
|
#include "crypto/hash.h"
|
||||||
|
#include "hashpriv.h"
|
||||||
|
|
||||||
|
|
||||||
static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
|
static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
|
||||||
|
@ -44,12 +45,13 @@ gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
|
static int
|
||||||
const struct iovec *iov,
|
qcrypto_gcrypt_hash_bytesv(QCryptoHashAlgorithm alg,
|
||||||
size_t niov,
|
const struct iovec *iov,
|
||||||
uint8_t **result,
|
size_t niov,
|
||||||
size_t *resultlen,
|
uint8_t **result,
|
||||||
Error **errp)
|
size_t *resultlen,
|
||||||
|
Error **errp)
|
||||||
{
|
{
|
||||||
int i, ret;
|
int i, ret;
|
||||||
gcry_md_hd_t md;
|
gcry_md_hd_t md;
|
||||||
|
@ -107,3 +109,8 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
|
||||||
gcry_md_close(md);
|
gcry_md_close(md);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QCryptoHashDriver qcrypto_hash_lib_driver = {
|
||||||
|
.hash_bytesv = qcrypto_gcrypt_hash_bytesv,
|
||||||
|
};
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "crypto/hash.h"
|
#include "crypto/hash.h"
|
||||||
|
#include "hashpriv.h"
|
||||||
|
|
||||||
|
|
||||||
static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
|
static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
|
||||||
|
@ -47,12 +48,13 @@ gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
|
static int
|
||||||
const struct iovec *iov,
|
qcrypto_glib_hash_bytesv(QCryptoHashAlgorithm alg,
|
||||||
size_t niov,
|
const struct iovec *iov,
|
||||||
uint8_t **result,
|
size_t niov,
|
||||||
size_t *resultlen,
|
uint8_t **result,
|
||||||
Error **errp)
|
size_t *resultlen,
|
||||||
|
Error **errp)
|
||||||
{
|
{
|
||||||
int i, ret;
|
int i, ret;
|
||||||
GChecksum *cs;
|
GChecksum *cs;
|
||||||
|
@ -95,3 +97,8 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
|
||||||
g_checksum_free(cs);
|
g_checksum_free(cs);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QCryptoHashDriver qcrypto_hash_lib_driver = {
|
||||||
|
.hash_bytesv = qcrypto_glib_hash_bytesv,
|
||||||
|
};
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "crypto/hash.h"
|
#include "crypto/hash.h"
|
||||||
|
#include "hashpriv.h"
|
||||||
#include <nettle/md5.h>
|
#include <nettle/md5.h>
|
||||||
#include <nettle/sha.h>
|
#include <nettle/sha.h>
|
||||||
#include <nettle/ripemd160.h>
|
#include <nettle/ripemd160.h>
|
||||||
|
@ -103,12 +104,13 @@ gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
|
static int
|
||||||
const struct iovec *iov,
|
qcrypto_nettle_hash_bytesv(QCryptoHashAlgorithm alg,
|
||||||
size_t niov,
|
const struct iovec *iov,
|
||||||
uint8_t **result,
|
size_t niov,
|
||||||
size_t *resultlen,
|
uint8_t **result,
|
||||||
Error **errp)
|
size_t *resultlen,
|
||||||
|
Error **errp)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
union qcrypto_hash_ctx ctx;
|
union qcrypto_hash_ctx ctx;
|
||||||
|
@ -152,3 +154,8 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QCryptoHashDriver qcrypto_hash_lib_driver = {
|
||||||
|
.hash_bytesv = qcrypto_nettle_hash_bytesv,
|
||||||
|
};
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "crypto/hash.h"
|
#include "crypto/hash.h"
|
||||||
|
#include "hashpriv.h"
|
||||||
|
|
||||||
static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = {
|
static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = {
|
||||||
[QCRYPTO_HASH_ALG_MD5] = 16,
|
[QCRYPTO_HASH_ALG_MD5] = 16,
|
||||||
|
@ -38,6 +39,18 @@ size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg)
|
||||||
return qcrypto_hash_alg_size[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,
|
int qcrypto_hash_bytes(QCryptoHashAlgorithm alg,
|
||||||
const char *buf,
|
const char *buf,
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
/*
|
||||||
|
* 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
|
Loading…
Reference in New Issue