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
/
ecdsagen.c
diff --git
a/src/ed25519/ecdsagen.c
b/src/ed25519/ecdsagen.c
index
d2a1489
..
bc14fd2
100644
(file)
--- a/
src/ed25519/ecdsagen.c
+++ b/
src/ed25519/ecdsagen.c
@@
-21,24
+21,24
@@
#include "ed25519.h"
#include "ed25519.h"
-#define
__TINC_ECDSA_INTERNAL__
+#define
TINC_ECDSA_INTERNAL
typedef struct {
uint8_t private[64];
uint8_t public[32];
} ecdsa_t;
typedef struct {
uint8_t private[64];
uint8_t public[32];
} ecdsa_t;
-#include "../crypto.h"
#include "../ecdsagen.h"
#include "../utils.h"
#include "../xalloc.h"
#include "../ecdsagen.h"
#include "../utils.h"
#include "../xalloc.h"
+#include "../random.h"
// Generate ECDSA key
ecdsa_t *ecdsa_generate(void) {
// Generate ECDSA key
ecdsa_t *ecdsa_generate(void) {
- ecdsa_t *ecdsa = xzalloc(sizeof
*ecdsa
);
+ ecdsa_t *ecdsa = xzalloc(sizeof
(*ecdsa)
);
uint8_t seed[32];
uint8_t seed[32];
- randomize(seed, sizeof
seed
);
+ randomize(seed, sizeof
(seed)
);
ed25519_create_keypair(ecdsa->public, ecdsa->private, seed);
return ecdsa;
ed25519_create_keypair(ecdsa->public, ecdsa->private, seed);
return ecdsa;
@@
-46,13
+46,15
@@
ecdsa_t *ecdsa_generate(void) {
// Write PEM ECDSA keys
// Write PEM ECDSA keys
-static bool write_pem(FILE *fp, const char *type, void *buf, size_t size) {
+static bool write_pem(FILE *fp, const char *type, void *
v
buf, size_t size) {
fprintf(fp, "-----BEGIN %s-----\n", type);
fprintf(fp, "-----BEGIN %s-----\n", type);
+ char *buf = vbuf;
char base64[65];
char base64[65];
+
while(size) {
size_t todo = size > 48 ? 48 : size;
while(size) {
size_t todo = size > 48 ? 48 : size;
- b64encode(buf, base64, todo);
+ b64encode
_tinc
(buf, base64, todo);
fprintf(fp, "%s\n", base64);
buf += todo;
size -= todo;
fprintf(fp, "%s\n", base64);
buf += todo;
size -= todo;
@@
-63,9
+65,9
@@
static bool write_pem(FILE *fp, const char *type, void *buf, size_t size) {
}
bool ecdsa_write_pem_public_key(ecdsa_t *ecdsa, FILE *fp) {
}
bool ecdsa_write_pem_public_key(ecdsa_t *ecdsa, FILE *fp) {
- return write_pem(fp, "ED25519 PUBLIC KEY", ecdsa->public, sizeof
ecdsa->public
);
+ return write_pem(fp, "ED25519 PUBLIC KEY", ecdsa->public, sizeof
(ecdsa->public)
);
}
bool ecdsa_write_pem_private_key(ecdsa_t *ecdsa, FILE *fp) {
}
bool ecdsa_write_pem_private_key(ecdsa_t *ecdsa, FILE *fp) {
- return write_pem(fp, "ED25519 PRIVATE KEY", ecdsa->private, sizeof
*ecdsa
);
+ return write_pem(fp, "ED25519 PRIVATE KEY", ecdsa->private, sizeof
(*ecdsa)
);
}
}