projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add AES-256-GCM support to SPTPS.
[tinc]
/
src
/
ed25519
/
ecdsa.c
diff --git
a/src/ed25519/ecdsa.c
b/src/ed25519/ecdsa.c
index
78e24fe
..
1ba01cf
100644
(file)
--- a/
src/ed25519/ecdsa.c
+++ b/
src/ed25519/ecdsa.c
@@
-32,21
+32,27
@@
typedef struct {
#include "../utils.h"
#include "../xalloc.h"
#include "../utils.h"
#include "../xalloc.h"
+static ecdsa_t *ecdsa_new(void) ATTR_MALLOC ATTR_DEALLOCATOR(ecdsa_free);
+static ecdsa_t *ecdsa_new(void) {
+ return xzalloc(sizeof(ecdsa_t));
+}
+
// Get and set ECDSA keys
//
ecdsa_t *ecdsa_set_base64_public_key(const char *p) {
// Get and set ECDSA keys
//
ecdsa_t *ecdsa_set_base64_public_key(const char *p) {
-
in
t len = strlen(p);
+
size_
t len = strlen(p);
if(len != 43) {
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;
}
return 0;
}
- ecdsa_t *ecdsa = xzalloc(sizeof(*ecdsa));
- len = b64decode(p, ecdsa->public, len);
+ ecdsa_t *ecdsa = ecdsa_new();
+ len = b64decode_tinc(p, ecdsa->public, len);
+
if(len != 32) {
if(len != 32) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Invalid format of public key! len = %
d",
len);
- free(ecdsa);
+ logger(DEBUG_ALWAYS, LOG_ERR, "Invalid format of public key! len = %
lu", (unsigned long)
len);
+
ecdsa_
free(ecdsa);
return 0;
}
return 0;
}
@@
-55,43
+61,45
@@
ecdsa_t *ecdsa_set_base64_public_key(const char *p) {
char *ecdsa_get_base64_public_key(ecdsa_t *ecdsa) {
char *base64 = xmalloc(44);
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
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) {
+ const size_t buflen = size;
char line[1024];
bool data = false;
size_t typelen = strlen(type);
char line[1024];
bool data = false;
size_t typelen = strlen(type);
+ char *buf = vbuf;
while(fgets(line, sizeof(line), fp)) {
if(!data) {
while(fgets(line, sizeof(line), fp)) {
if(!data) {
- if(strncmp(line, "-----BEGIN ", 11))
+ if(strncmp(line, "-----BEGIN ", 11))
{
continue;
continue;
- if(strncmp(line + 11, type, typelen))
+ }
+
+ if(strncmp(line + 11, type, typelen)) {
continue;
continue;
+ }
+
data = true;
continue;
}
data = true;
continue;
}
- if(!strncmp(line, "-----END ", 9))
+ if(!strncmp(line, "-----END ", 9))
{
break;
break;
+ }
size_t linelen = strcspn(line, "\r\n");
size_t linelen = strcspn(line, "\r\n");
- size_t len = b64decode(line, line, linelen);
- if(!len) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Invalid base64 data in PEM file\n");
- errno = EINVAL;
- return false;
- }
+ size_t len = b64decode_tinc(line, line, linelen);
- if(len > size) {
- logger(DEBUG_ALWAYS, LOG_ERR, "
Too much 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;
errno = EINVAL;
-
return false
;
+
goto exit
;
}
memcpy(buf, line, len);
}
memcpy(buf, line, len);
@@
-106,6
+114,13
@@
static bool read_pem(FILE *fp, const char *type, void *buf, size_t size) {
} else {
errno = ENOENT;
}
} else {
errno = ENOENT;
}
+ }
+
+exit:
+ memzero(line, sizeof(line));
+
+ if(size) {
+ memzero(vbuf, buflen);
return false;
}
return false;
}
@@
-113,22
+128,29
@@
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_read_pem_public_key(FILE *fp) {
- ecdsa_t *ecdsa = xzalloc(sizeof(*ecdsa));
- if(read_pem(fp, "ED25519 PUBLIC KEY", ecdsa->public, sizeof(ecdsa->public)))
+ ecdsa_t *ecdsa = ecdsa_new();
+
+ if(read_pem(fp, "ED25519 PUBLIC KEY", ecdsa->public, sizeof(ecdsa->public))) {
return ecdsa;
return ecdsa;
- free(ecdsa);
- return 0;
+ }
+
+ ecdsa_free(ecdsa);
+ return NULL;
}
ecdsa_t *ecdsa_read_pem_private_key(FILE *fp) {
}
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)))
+ ecdsa_t *ecdsa = ecdsa_new();
+
+ if(read_pem(fp, "ED25519 PRIVATE KEY", ecdsa->private, sizeof(*ecdsa))) {
return ecdsa;
return ecdsa;
- free(ecdsa);
- return 0;
+ }
+
+ ecdsa_free(ecdsa);
+ return NULL;
}
size_t ecdsa_size(ecdsa_t *ecdsa) {
}
size_t ecdsa_size(ecdsa_t *ecdsa) {
+ (void)ecdsa;
return 64;
}
return 64;
}
@@
-148,5
+170,5
@@
bool ecdsa_active(ecdsa_t *ecdsa) {
}
void ecdsa_free(ecdsa_t *ecdsa) {
}
void ecdsa_free(ecdsa_t *ecdsa) {
-
free(ecdsa
);
+
xzfree(ecdsa, sizeof(ecdsa_t)
);
}
}