Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / openssl / digest.c

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 20e45b6..82364e7 100644 (file)
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -27,13 +27,13 @@
 #include "../digest.h"
 #include "../logger.h"
 
-static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
+static digest_t *digest_open(const EVP_MD *evp_md, size_t maclength) {
        digest_t *digest = xzalloc(sizeof(*digest));
        digest->digest = evp_md;
 
-       int digestlen = EVP_MD_size(digest->digest);
+       size_t digestlen = EVP_MD_size(digest->digest);
 
-       if(maclength > digestlen || maclength < 0) {
+       if(maclength == DIGEST_ALGO_SIZE || maclength > digestlen) {
                digest->maclength = digestlen;
        } else {
                digest->maclength = maclength;
@@ -42,7 +42,7 @@ static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
        return digest;
 }
 
-digest_t *digest_open_by_name(const char *name, int maclength) {
+digest_t *digest_open_by_name(const char *name, size_t maclength) {
        const EVP_MD *evp_md = EVP_get_digestbyname(name);
 
        if(!evp_md) {
@@ -53,7 +53,7 @@ digest_t *digest_open_by_name(const char *name, int maclength) {
        return digest_open(evp_md, maclength);
 }
 
-digest_t *digest_open_by_nid(int nid, int maclength) {
+digest_t *digest_open_by_nid(int nid, size_t maclength) {
        const EVP_MD *evp_md = EVP_get_digestbynid(nid);
 
        if(!evp_md) {
@@ -66,7 +66,7 @@ digest_t *digest_open_by_nid(int nid, int maclength) {
 
 bool digest_set_key(digest_t *digest, const void *key, size_t len) {
        digest->hmac_ctx = HMAC_CTX_new();
-       HMAC_Init_ex(digest->hmac_ctx, key, len, digest->digest, NULL);
+       HMAC_Init_ex(digest->hmac_ctx, key, (int)len, digest->digest, NULL);
 
        if(!digest->hmac_ctx) {
                abort();