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

[tinc] / src / ed25519 / ecdsa.c

diff --git a/src/ed25519/ecdsa.c b/src/ed25519/ecdsa.c
index 78e24fe..f0ce2c1 100644 (file)
--- a/src/ed25519/ecdsa.c
+++ b/src/ed25519/ecdsa.c
@@ -35,17 +35,18 @@ typedef struct {
 // Get and set ECDSA keys
 //
 ecdsa_t *ecdsa_set_base64_public_key(const char *p) {
-       int len = strlen(p);
+       size_t len = strlen(p);
 
        if(len != 43) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Invalid size %d for public key!", len);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Invalid size %lu for public key!", (unsigned long)len);
                return 0;
        }
 
        ecdsa_t *ecdsa = xzalloc(sizeof(*ecdsa));
-       len = b64decode(p, ecdsa->public, len);
+       len = b64decode_tinc(p, ecdsa->public, len);
+
        if(len != 32) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Invalid format of public key! len = %d", len);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Invalid format of public key! len = %lu", (unsigned long)len);
                free(ecdsa);
                return 0;
        }
@@ -55,33 +56,40 @@ ecdsa_t *ecdsa_set_base64_public_key(const char *p) {
 
 char *ecdsa_get_base64_public_key(ecdsa_t *ecdsa) {
        char *base64 = xmalloc(44);
-       b64encode(ecdsa->public, base64, sizeof(ecdsa->public));
+       b64encode_tinc(ecdsa->public, base64, sizeof(ecdsa->public));
 
        return base64;
 }
 
 // Read PEM ECDSA keys
 
-static bool read_pem(FILE *fp, const char *type, void *buf, size_t size) {
+static bool read_pem(FILE *fp, const char *type, void *vbuf, size_t size) {
        char line[1024];
        bool data = false;
        size_t typelen = strlen(type);
+       char *buf = vbuf;
 
        while(fgets(line, sizeof(line), fp)) {
                if(!data) {
-                       if(strncmp(line, "-----BEGIN ", 11))
+                       if(strncmp(line, "-----BEGIN ", 11)) {
                                continue;
-                       if(strncmp(line + 11, type, typelen))
+                       }
+
+                       if(strncmp(line + 11, type, typelen)) {
                                continue;
+                       }
+
                        data = true;
                        continue;
                }
 
-               if(!strncmp(line, "-----END ", 9))
+               if(!strncmp(line, "-----END ", 9)) {
                        break;
+               }
 
                size_t linelen = strcspn(line, "\r\n");
-               size_t len = b64decode(line, line, linelen);
+               size_t len = b64decode_tinc(line, line, linelen);
+
                if(!len) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "Invalid base64 data in PEM file\n");
                        errno = EINVAL;
@@ -106,6 +114,7 @@ static bool read_pem(FILE *fp, const char *type, void *buf, size_t size) {
                } else {
                        errno = ENOENT;
                }
+
                return false;
        }
 
@@ -114,21 +123,28 @@ static bool read_pem(FILE *fp, const char *type, void *buf, size_t size) {
 
 ecdsa_t *ecdsa_read_pem_public_key(FILE *fp) {
        ecdsa_t *ecdsa = xzalloc(sizeof(*ecdsa));
-       if(read_pem(fp, "ED25519 PUBLIC KEY", ecdsa->public, sizeof(ecdsa->public)))
+
+       if(read_pem(fp, "ED25519 PUBLIC KEY", ecdsa->public, sizeof(ecdsa->public))) {
                return ecdsa;
+       }
+
        free(ecdsa);
        return 0;
 }
 
 ecdsa_t *ecdsa_read_pem_private_key(FILE *fp) {
        ecdsa_t *ecdsa = xmalloc(sizeof(*ecdsa));
-       if(read_pem(fp, "ED25519 PRIVATE KEY", ecdsa->private, sizeof(*ecdsa)))
+
+       if(read_pem(fp, "ED25519 PRIVATE KEY", ecdsa->private, sizeof(*ecdsa))) {
                return ecdsa;
+       }
+
        free(ecdsa);
        return 0;
 }
 
 size_t ecdsa_size(ecdsa_t *ecdsa) {
+       (void)ecdsa;
        return 64;
 }