aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crypto/hash-nettle.c12
-rw-r--r--crypto/hmac-nettle.c17
2 files changed, 22 insertions, 7 deletions
diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c
index 96f186f442..6ffb9c3db7 100644
--- a/crypto/hash-nettle.c
+++ b/crypto/hash-nettle.c
@@ -26,12 +26,18 @@
#include <nettle/sha.h>
#include <nettle/ripemd160.h>
+#if CONFIG_NETTLE_VERSION_MAJOR < 3
+typedef unsigned int hash_length_t;
+#else
+typedef size_t hash_length_t;
+#endif
+
typedef void (*qcrypto_nettle_init)(void *ctx);
typedef void (*qcrypto_nettle_write)(void *ctx,
- unsigned int len,
+ hash_length_t len,
const uint8_t *buf);
typedef void (*qcrypto_nettle_result)(void *ctx,
- unsigned int len,
+ hash_length_t len,
uint8_t *buf);
union qcrypto_hash_ctx {
@@ -112,7 +118,7 @@ qcrypto_nettle_hash_bytesv(QCryptoHashAlgorithm alg,
size_t *resultlen,
Error **errp)
{
- int i;
+ size_t i;
union qcrypto_hash_ctx ctx;
if (!qcrypto_hash_supports(alg)) {
diff --git a/crypto/hmac-nettle.c b/crypto/hmac-nettle.c
index ec2d61bdde..1152b741fd 100644
--- a/crypto/hmac-nettle.c
+++ b/crypto/hmac-nettle.c
@@ -18,14 +18,23 @@
#include "hmacpriv.h"
#include <nettle/hmac.h>
+#if CONFIG_NETTLE_VERSION_MAJOR < 3
+typedef unsigned int hmac_length_t;
+#else
+typedef size_t hmac_length_t;
+#endif
+
typedef void (*qcrypto_nettle_hmac_setkey)(void *ctx,
- size_t key_length, const uint8_t *key);
+ hmac_length_t key_length,
+ const uint8_t *key);
typedef void (*qcrypto_nettle_hmac_update)(void *ctx,
- size_t length, const uint8_t *data);
+ hmac_length_t length,
+ const uint8_t *data);
typedef void (*qcrypto_nettle_hmac_digest)(void *ctx,
- size_t length, uint8_t *digest);
+ hmac_length_t length,
+ uint8_t *digest);
typedef struct QCryptoHmacNettle QCryptoHmacNettle;
struct QCryptoHmacNettle {
@@ -135,7 +144,7 @@ qcrypto_nettle_hmac_bytesv(QCryptoHmac *hmac,
Error **errp)
{
QCryptoHmacNettle *ctx;
- int i;
+ size_t i;
ctx = (QCryptoHmacNettle *)hmac->opaque;