Replace pointers to cipher_t/digest_t in connection_t with structs.

[tinc] / src / openssl / digest.c

diff --git a/src/openssl/digest.c b/src/openssl/digest.c
index 9569f3c..71eaec7 100644 (file)
--- a/src/openssl/digest.c
+++ b/src/openssl/digest.c
@@ -18,8 +18,6 @@
 */
 
 #include "../system.h"
-#include "../utils.h"
-#include "../xalloc.h"
 
 #include <openssl/err.h>
 #include <openssl/hmac.h>
@@ -28,22 +26,19 @@
 #include "../digest.h"
 #include "../logger.h"
 
-static digest_t *digest_open(const EVP_MD *evp_md, int maclength) {
-       digest_t *digest = xzalloc(sizeof(*digest));
+static void digest_open(digest_t *digest, const EVP_MD *evp_md, size_t maclength) {
        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;
        }
-
-       return digest;
 }
 
-digest_t *digest_open_by_name(const char *name, int maclength) {
+bool digest_open_by_name(digest_t *digest, const char *name, size_t maclength) {
        const EVP_MD *evp_md = EVP_get_digestbyname(name);
 
        if(!evp_md) {
@@ -51,10 +46,11 @@ digest_t *digest_open_by_name(const char *name, int maclength) {
                return false;
        }
 
-       return digest_open(evp_md, maclength);
+       digest_open(digest, evp_md, maclength);
+       return true;
 }
 
-digest_t *digest_open_by_nid(int nid, int maclength) {
+bool digest_open_by_nid(digest_t *digest, int nid, size_t maclength) {
        const EVP_MD *evp_md = EVP_get_digestbynid(nid);
 
        if(!evp_md) {
@@ -62,17 +58,13 @@ digest_t *digest_open_by_nid(int nid, int maclength) {
                return false;
        }
 
-       return digest_open(evp_md, maclength);
+       digest_open(digest, evp_md, maclength);
+       return true;
 }
 
 bool digest_set_key(digest_t *digest, const void *key, size_t len) {
-#ifdef HAVE_HMAC_CTX_NEW
        digest->hmac_ctx = HMAC_CTX_new();
-       HMAC_Init_ex(digest->hmac_ctx, key, len, digest->digest, NULL);
-#else
-       digest->hmac_ctx = xzalloc(sizeof(*digest->hmac_ctx));
-       HMAC_Init(digest->hmac_ctx, key, len, digest->digest);
-#endif
+       HMAC_Init_ex(digest->hmac_ctx, key, (int)len, digest->digest, NULL);
 
        if(!digest->hmac_ctx) {
                abort();
@@ -90,17 +82,11 @@ void digest_close(digest_t *digest) {
                EVP_MD_CTX_destroy(digest->md_ctx);
        }
 
-#ifdef HAVE_HMAC_CTX_NEW
-
        if(digest->hmac_ctx) {
                HMAC_CTX_free(digest->hmac_ctx);
        }
 
-#else
-       free(digest->hmac_ctx);
-#endif
-
-       free(digest);
+       memset(digest, 0, sizeof(*digest));
 }
 
 bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) {