Enable and fix many extra warnings supported by GCC and Clang.

[tinc] / src / digest.h

diff --git a/src/digest.h b/src/digest.h
index 204048a..dba6ee4 100644 (file)
--- a/src/digest.h
+++ b/src/digest.h
@@ -1,6 +1,9 @@
+#ifndef TINC_DIGEST_H
+#define TINC_DIGEST_H
+
 /*
     digest.h -- header file digest.c
-    Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2022 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,27 +20,36 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_DIGEST_H__
-#define __TINC_DIGEST_H__
+#include "system.h"
 
 #define DIGEST_MAX_SIZE 64
+#define DIGEST_ALGO_SIZE ((size_t) -1)
 
 #ifndef DISABLE_LEGACY
 
-typedef struct digest digest_t;
-
-extern digest_t *digest_open_by_name(const char *name, int maclength) __attribute__ ((__malloc__));
-extern digest_t *digest_open_by_nid(int nid, int maclength) __attribute__ ((__malloc__));
-extern digest_t *digest_open_sha1(int maclength) __attribute__ ((__malloc__));
-extern void digest_close(digest_t *);
-extern bool digest_create(digest_t *, const void *indata, size_t inlen, void *outdata) __attribute__ ((__warn_unused_result__));
-extern bool digest_verify(digest_t *, const void *indata, size_t inlen, const void *digestdata) __attribute__ ((__warn_unused_result__));
-extern bool digest_set_key(digest_t *, const void *key, size_t len) __attribute__ ((__warn_unused_result__));
-extern int digest_get_nid(const digest_t *);
-extern size_t digest_keylength(const digest_t *);
-extern size_t digest_length(const digest_t *);
-extern bool digest_active(const digest_t *);
-
+#ifdef HAVE_OPENSSL
+#include "openssl/digest.h"
+#elif HAVE_LIBGCRYPT
+#include "gcrypt/digest.h"
+#else
+#error Incorrect cryptographic library, please reconfigure.
 #endif
 
-#endif
+typedef struct digest digest_t;
+
+extern bool digest_open_by_name(digest_t *digest, const char *name, size_t maclength);
+extern bool digest_open_by_nid(digest_t *digest, int nid, size_t maclength);
+extern digest_t *digest_alloc(void) __attribute__((__malloc__));
+extern void digest_free(digest_t **digest);
+extern void digest_close(digest_t *digest);
+extern bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) __attribute__((__warn_unused_result__));
+extern bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const void *digestdata) __attribute__((__warn_unused_result__));
+extern bool digest_set_key(digest_t *digest, const void *key, size_t len) __attribute__((__warn_unused_result__));
+extern int digest_get_nid(const digest_t *digest);
+extern size_t digest_keylength(const digest_t *digest);
+extern size_t digest_length(const digest_t *digest);
+extern bool digest_active(const digest_t *digest);
+
+#endif // DISABLE_LEGACY
+
+#endif // TINC_DIGEST_H