From 5cd610a07468137066ea4daa5176c3e7045113b0 Mon Sep 17 00:00:00 2001
From: Uros Majstorovic <majstor@majstor.org>
Date: Wed, 5 Aug 2020 03:38:22 +0200
Subject: ecp moved to root; fixed utils and tests
---
code/util/Makefile | 22 -------------
code/util/keydump | 3 --
code/util/mknode.c | 64 -------------------------------------
code/util/util.c | 92 ------------------------------------------------------
code/util/util.h | 5 ---
5 files changed, 186 deletions(-)
delete mode 100644 code/util/Makefile
delete mode 100755 code/util/keydump
delete mode 100644 code/util/mknode.c
delete mode 100644 code/util/util.c
delete mode 100644 code/util/util.h
(limited to 'code/util')
diff --git a/code/util/Makefile b/code/util/Makefile
deleted file mode 100644
index acbae33..0000000
--- a/code/util/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-include ../ecp/Makefile.posix
-CFLAGS=$(CFLAGS_PL) -I../ecp
-LDFLAGS=$(LDFLAGS_PL)
-
-obj=util.o
-dep=../ecp/build-posix/*.a ./libecputil.a
-
-
-%.o: %.c %.h
- $(CC) $(CFLAGS) -c $<
-
-all: libecputil.a mknode
-
-libecputil.a: $(obj)
- $(AR) rcs libecputil.a $(obj)
-
-mknode: mknode.o libecputil.a
- $(CC) -o $@ $< $(dep) $(LDFLAGS)
-
-clean:
- rm -f *.o *.a
- rm -f mknode
diff --git a/code/util/keydump b/code/util/keydump
deleted file mode 100755
index 9a884dc..0000000
--- a/code/util/keydump
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-hexdump -e '16/1 "0x%02X, " "\n"' $@
diff --git a/code/util/mknode.c b/code/util/mknode.c
deleted file mode 100644
index 1c0a83a..0000000
--- a/code/util/mknode.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "core.h"
-#include "util.h"
-
-#define FN_LEN 256
-
-static char fn_key[FN_LEN];
-static char fn_node[FN_LEN];
-
-static int v_rng(void *buf, size_t bufsize) {
- int fd;
-
- if((fd = open("/dev/urandom", O_RDONLY)) < 0) return -1;
- size_t nb = read(fd, buf, bufsize);
- close(fd);
- if (nb != bufsize) return -1;
- return 0;
-}
-
-static void usage(char *arg) {
- fprintf(stderr, "Usage: %s <name> [address]\n", arg);
- exit(1);
-}
-
-int main(int argc, char *argv[]) {
- int rv;
- ECPContext ctx;
- ECPDHKey key;
- ECPNode node;
-
- if ((argc < 2) || (argc > 3)) usage(argv[0]);
-
- if (strlen(argv[1]) > FN_LEN - 6) usage(argv[0]);
- strcpy(fn_node, argv[1]);
- strcpy(fn_key, argv[1]);
- strcat(fn_key, ".priv");
- strcat(fn_node, ".pub");
-
- rv = ecp_ctx_create(&ctx);
- if (rv) goto err;
- ctx.rng = v_rng;
-
- rv = ecp_dhkey_generate(&ctx, &key);
- if (rv) goto err;
-
- rv = ecp_node_init(&ctx, &node, &key.public, (argc == 3) ? argv[2] : NULL);
- if (rv) goto err;
-
- rv = ecp_util_key_save(&ctx, &key, fn_key);
- if (rv) goto err;
-
- rv = ecp_util_node_save(&ctx, &node, fn_node);
- if (rv) goto err;
-
- return 0;
- err:
- printf("ERR:%d\n", rv);
- return 1;
-}
\ No newline at end of file
diff --git a/code/util/util.c b/code/util/util.c
deleted file mode 100644
index 4f4adc2..0000000
--- a/code/util/util.c
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "core.h"
-#include "cr.h"
-#include "util.h"
-
-int ecp_util_key_save(ECPContext *ctx, ECPDHKey *key, char *filename) {
- int fd;
- ssize_t rv;
-
- if ((fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) < 0) return ECP_ERR;
- rv = write(fd, ecp_cr_dh_pub_get_buf(&key->public), ECP_ECDH_SIZE_KEY);
- if (rv != ECP_ECDH_SIZE_KEY) {
- close(fd);
- return ECP_ERR;
- }
- rv = write(fd, &key->private, sizeof(key->private));
- if (rv != sizeof(key->private)) {
- close(fd);
- return ECP_ERR;
- }
- close(fd);
- return ECP_OK;
-}
-
-int ecp_util_key_load(ECPContext *ctx, ECPDHKey *key, char *filename) {
- int fd;
- ssize_t rv;
- unsigned char buf[ECP_ECDH_SIZE_KEY];
-
- if ((fd = open(filename, O_RDONLY)) < 0) return ECP_ERR;
- rv = read(fd, buf, ECP_ECDH_SIZE_KEY);
- if (rv != ECP_ECDH_SIZE_KEY) {
- close(fd);
- return ECP_ERR;
- }
- rv = read(fd, &key->private, sizeof(key->private));
- if (rv != sizeof(key->private)) {
- close(fd);
- return ECP_ERR;
- }
- close(fd);
-
- ecp_cr_dh_pub_from_buf(&key->public, buf);
-
- key->valid = 1;
- return ECP_OK;
-}
-
-int ecp_util_node_save(ECPContext *ctx, ECPNode *node, char *filename) {
- int fd;
- ssize_t rv;
-
- if ((fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) < 0) return ECP_ERR;
- rv = write(fd, ecp_cr_dh_pub_get_buf(&node->public), ECP_ECDH_SIZE_KEY);
- if (rv != ECP_ECDH_SIZE_KEY) {
- close(fd);
- return ECP_ERR;
- }
- rv = write(fd, &node->addr, sizeof(node->addr));
- if (rv != sizeof(node->addr)) {
- close(fd);
- return ECP_ERR;
- }
- close(fd);
- return ECP_OK;
-}
-
-int ecp_util_node_load(ECPContext *ctx, ECPNode *node, char *filename) {
- int fd;
- ssize_t rv;
- unsigned char buf[ECP_ECDH_SIZE_KEY];
-
- if ((fd = open(filename, O_RDONLY)) < 0) return ECP_ERR;
- rv = read(fd, buf, ECP_ECDH_SIZE_KEY);
- if (rv != ECP_ECDH_SIZE_KEY) {
- close(fd);
- return ECP_ERR;
- }
- rv = read(fd, &node->addr, sizeof(node->addr));
- if (rv != sizeof(node->addr)) {
- close(fd);
- return ECP_ERR;
- }
- close(fd);
-
- ecp_cr_dh_pub_from_buf(&node->public, buf);
-
- return ECP_OK;
-}
\ No newline at end of file
diff --git a/code/util/util.h b/code/util/util.h
deleted file mode 100644
index 3d07588..0000000
--- a/code/util/util.h
+++ /dev/null
@@ -1,5 +0,0 @@
-int ecp_util_key_save(ECPContext *ctx, ECPDHKey *key, char *filename);
-int ecp_util_key_load(ECPContext *ctx, ECPDHKey *key, char *filename);
-
-int ecp_util_node_save(ECPContext *ctx, ECPNode *node, char *filename);
-int ecp_util_node_load(ECPContext *ctx, ECPNode *node, char *filename);
\ No newline at end of file
--
cgit v1.2.3