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

[tinc] / src / nolegacy / crypto.c

diff --git a/src/nolegacy/crypto.c b/src/nolegacy/crypto.c
index b013f1f..d9df828 100644 (file)
--- a/src/nolegacy/crypto.c
+++ b/src/nolegacy/crypto.c
@@ -1,6 +1,6 @@
 /*
     crypto.c -- Cryptographic miscellaneous functions and initialisation
-    Copyright (C) 2007-2014 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2021 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
@@ -43,13 +43,13 @@ static void random_exit(void) {
 }
 
 void randomize(void *vout, size_t outlen) {
-       char *out = vout;
+       uint8_t *out = vout;
 
        while(outlen) {
-               size_t len = read(random_fd, out, outlen);
+               ssize_t len = read(random_fd, out, outlen);
 
                if(len <= 0) {
-                       if(errno == EAGAIN || errno == EINTR) {
+                       if(len == -1 && (errno == EAGAIN || errno == EINTR)) {
                                continue;
                        }
 
@@ -67,14 +67,14 @@ void randomize(void *vout, size_t outlen) {
 #include <wincrypt.h>
 HCRYPTPROV prov;
 
-void random_init(void) {
+static void random_init(void) {
        if(!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
                fprintf(stderr, "CryptAcquireContext() failed!\n");
                abort();
        }
 }
 
-void random_exit(void) {
+static void random_exit(void) {
        CryptReleaseContext(prov, 0);
 }