External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce virCryptoHashBuf

Browse Source 
A function that keeps the hash in binary form instead of converting
it to human-readable hexadecimal form.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2018-05-11 16:31:10 +02:00
parent 95ba1c2f6e
commit 0eeedd61a9
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -1648,6 +1648,7 @@ virConfWriteMem;
# util/vircrypto.h
virCryptoEncryptData;
virCryptoGenerateRandom;
virCryptoHashBuf;
virCryptoHashString;
virCryptoHaveCipher;

31
src/util/vircrypto.c
View File

@ -53,6 +53,26 @@ struct virHashInfo {
verify(ARRAY_CARDINALITY(hashinfo) == VIR_CRYPTO_HASH_LAST);
int
virCryptoHashBuf(virCryptoHash hash,
const char *input,
unsigned char *output)
{
if (hash >= VIR_CRYPTO_HASH_LAST) {
virReportError(VIR_ERR_INVALID_ARG,
_("Unknown crypto hash %d"), hash);
return -1;
}
if (!(hashinfo[hash].func(input, strlen(input), output))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to compute hash of data"));
return -1;
}
return 0;
}
int
virCryptoHashString(virCryptoHash hash,
const char *input,
@ -62,20 +82,11 @@ virCryptoHashString(virCryptoHash hash,
size_t hashstrlen;
size_t i;
if (hash >= VIR_CRYPTO_HASH_LAST) {
virReportError(VIR_ERR_INVALID_ARG,
_("Unknown crypto hash %d"), hash);
if (virCryptoHashBuf(hash, input, buf) < 0)
return -1;
}
hashstrlen = (hashinfo[hash].hashlen * 2) + 1;
if (!(hashinfo[hash].func(input, strlen(input), buf))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to compute hash of data"));
return -1;
}
if (VIR_ALLOC_N(*output, hashstrlen) < 0)
return -1;

7
src/util/vircrypto.h
View File

@ -41,6 +41,13 @@ typedef enum {
VIR_CRYPTO_CIPHER_LAST
} virCryptoCipher;
int
virCryptoHashBuf(virCryptoHash hash,
const char *input,
unsigned char *output)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
ATTRIBUTE_RETURN_CHECK;
int
virCryptoHashString(virCryptoHash hash,
const char *input,