X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fed25519%2Fecdsagen.c;h=bc14fd297abcaaf04c903562dde315059bdc07e6;hb=0fe69908838248c28624beb540257892db6bdcbd;hp=418457390d5033069700d277985ba7f242fa3113;hpb=2f01744f82be542894fe2ceecbfb9ead93c9ffa5;p=tinc

diff --git a/src/ed25519/ecdsagen.c b/src/ed25519/ecdsagen.c
index 41845739..bc14fd29 100644
--- a/src/ed25519/ecdsagen.c
+++ b/src/ed25519/ecdsagen.c
@@ -21,24 +21,24 @@
 
 #include "ed25519.h"
 
-#define __TINC_ECDSA_INTERNAL__
+#define TINC_ECDSA_INTERNAL
 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 "../random.h"
 
 // Generate ECDSA key
 
 ecdsa_t *ecdsa_generate(void) {
-	ecdsa_t *ecdsa = xzalloc(sizeof *ecdsa);
+	ecdsa_t *ecdsa = xzalloc(sizeof(*ecdsa));
 
 	uint8_t seed[32];
-	randomize(seed, sizeof seed);
+	randomize(seed, sizeof(seed));
 	ed25519_create_keypair(ecdsa->public, ecdsa->private, seed);
 
 	return ecdsa;
@@ -46,10 +46,28 @@ ecdsa_t *ecdsa_generate(void) {
 
 // Write PEM ECDSA keys
 
+static bool write_pem(FILE *fp, const char *type, void *vbuf, size_t size) {
+	fprintf(fp, "-----BEGIN %s-----\n", type);
+
+	char *buf = vbuf;
+	char base64[65];
+
+	while(size) {
+		size_t todo = size > 48 ? 48 : size;
+		b64encode_tinc(buf, base64, todo);
+		fprintf(fp, "%s\n", base64);
+		buf += todo;
+		size -= todo;
+	}
+
+	fprintf(fp, "-----END %s-----\n", type);
+	return !ferror(fp);
+}
+
 bool ecdsa_write_pem_public_key(ecdsa_t *ecdsa, FILE *fp) {
-	return fwrite(ecdsa->public, sizeof ecdsa->public, 1, fp) == 1;
+	return write_pem(fp, "ED25519 PUBLIC KEY", ecdsa->public, sizeof(ecdsa->public));
 }
 
 bool ecdsa_write_pem_private_key(ecdsa_t *ecdsa, FILE *fp) {
-	return fwrite(ecdsa, sizeof *ecdsa, 1, fp) == 1;
+	return write_pem(fp, "ED25519 PRIVATE KEY", ecdsa->private, sizeof(*ecdsa));
 }