projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CI: ignore package job failures
[tinc]
/
src
/
ed25519
/
ecdsa.c
diff --git
a/src/ed25519/ecdsa.c
b/src/ed25519/ecdsa.c
index
bfdabc1
..
f0ce2c1
100644
(file)
--- a/
src/ed25519/ecdsa.c
+++ b/
src/ed25519/ecdsa.c
@@
-21,7
+21,7
@@
#include "ed25519.h"
#include "ed25519.h"
-#define
__TINC_ECDSA_INTERNAL__
+#define
TINC_ECDSA_INTERNAL
typedef struct {
uint8_t private[64];
uint8_t public[32];
typedef struct {
uint8_t private[64];
uint8_t public[32];
@@
-35,17
+35,18
@@
typedef struct {
// 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 = xzalloc(sizeof(*ecdsa));
+ 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);
+ logger(DEBUG_ALWAYS, LOG_ERR, "Invalid format of public key! len = %
lu", (unsigned long)
len);
free(ecdsa);
return 0;
}
free(ecdsa);
return 0;
}
@@
-55,40
+56,49
@@
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 *
v
buf, size_t 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)) {
+ while(fgets(line, sizeof
(line)
, fp)) {
if(!data) {
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);
+ size_t len = b64decode_tinc(line, line, linelen);
+
if(!len) {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid base64 data in PEM file\n");
if(!len) {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid base64 data in PEM file\n");
+ errno = EINVAL;
return false;
}
if(len > size) {
logger(DEBUG_ALWAYS, LOG_ERR, "Too much base64 data in PEM file\n");
return false;
}
if(len > size) {
logger(DEBUG_ALWAYS, LOG_ERR, "Too much base64 data in PEM file\n");
+ errno = EINVAL;
return false;
}
return false;
}
@@
-98,7
+108,13
@@
static bool read_pem(FILE *fp, const char *type, void *buf, size_t size) {
}
if(size) {
}
if(size) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Too little base64 data in PEM file\n");
+ if(data) {
+ errno = EINVAL;
+ logger(DEBUG_ALWAYS, LOG_ERR, "Too little base64 data in PEM file\n");
+ } else {
+ errno = ENOENT;
+ }
+
return false;
}
return false;
}
@@
-106,22
+122,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 = xzalloc(sizeof(*ecdsa));
+
+ if(read_pem(fp, "ED25519 PUBLIC KEY", ecdsa->public, sizeof(ecdsa->public))) {
return ecdsa;
return ecdsa;
+ }
+
free(ecdsa);
return 0;
}
ecdsa_t *ecdsa_read_pem_private_key(FILE *fp) {
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))
+ ecdsa_t *ecdsa = xmalloc(sizeof(*ecdsa));
+
+ if(read_pem(fp, "ED25519 PRIVATE KEY", ecdsa->private, sizeof(*ecdsa))) {
return ecdsa;
return ecdsa;
+ }
+
free(ecdsa);
return 0;
}
size_t ecdsa_size(ecdsa_t *ecdsa) {
free(ecdsa);
return 0;
}
size_t ecdsa_size(ecdsa_t *ecdsa) {
+ (void)ecdsa;
return 64;
}
return 64;
}