X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fed25519%2Fecdsa.c;h=28daf4a1672132a373913d6c0a7b155709007948;hb=c44b08613508c993e7fd9f625e0b1b4775efffed;hp=8dee1246a05b3d3c64ce012d7f0d036fbe91055c;hpb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;p=tinc

diff --git a/src/ed25519/ecdsa.c b/src/ed25519/ecdsa.c
index 8dee1246..28daf4a1 100644
--- a/src/ed25519/ecdsa.c
+++ b/src/ed25519/ecdsa.c
@@ -38,16 +38,16 @@ ecdsa_t *ecdsa_set_base64_public_key(const char *p) {
 	size_t len = strlen(p);
 
 	if(len != 43) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid size %zu 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 = %zu", len);
-		free(ecdsa);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid format of public key! len = %lu", (unsigned long)len);
+		ecdsa_free(ecdsa);
 		return 0;
 	}
 
@@ -56,7 +56,7 @@ 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;
 }
@@ -64,6 +64,7 @@ char *ecdsa_get_base64_public_key(ecdsa_t *ecdsa) {
 // Read PEM ECDSA keys
 
 static bool read_pem(FILE *fp, const char *type, void *vbuf, size_t size) {
+	const size_t buflen = size;
 	char line[1024];
 	bool data = false;
 	size_t typelen = strlen(type);
@@ -88,18 +89,12 @@ static bool read_pem(FILE *fp, const char *type, void *vbuf, size_t size) {
 		}
 
 		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");
+		if(!len || len > size) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "%s base64 data in PEM file\n", len ? "Too much" : "Invalid");
 			errno = EINVAL;
-			return false;
-		}
-
-		if(len > size) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Too much base64 data in PEM file\n");
-			errno = EINVAL;
-			return false;
+			goto exit;
 		}
 
 		memcpy(buf, line, len);
@@ -114,7 +109,13 @@ static bool read_pem(FILE *fp, const char *type, void *vbuf, size_t size) {
 		} else {
 			errno = ENOENT;
 		}
+	}
+
+exit:
+	memzero(line, sizeof(line));
 
+	if(size) {
+		memzero(vbuf, buflen);
 		return false;
 	}
 
@@ -128,8 +129,8 @@ ecdsa_t *ecdsa_read_pem_public_key(FILE *fp) {
 		return ecdsa;
 	}
 
-	free(ecdsa);
-	return 0;
+	ecdsa_free(ecdsa);
+	return NULL;
 }
 
 ecdsa_t *ecdsa_read_pem_private_key(FILE *fp) {
@@ -139,8 +140,8 @@ ecdsa_t *ecdsa_read_pem_private_key(FILE *fp) {
 		return ecdsa;
 	}
 
-	free(ecdsa);
-	return 0;
+	ecdsa_free(ecdsa);
+	return NULL;
 }
 
 size_t ecdsa_size(ecdsa_t *ecdsa) {
@@ -164,5 +165,5 @@ bool ecdsa_active(ecdsa_t *ecdsa) {
 }
 
 void ecdsa_free(ecdsa_t *ecdsa) {
-	free(ecdsa);
+	xzfree(ecdsa, sizeof(ecdsa_t));
 }