Converting to C++.

Author: wolfmcnally

configure

@@ -7,6 +7,7 @@ AC_CONFIG_SRCDIR([src/seedtool.cpp])
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
+AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
 

configure.ac

@@ -35,8 +35,6 @@ OBJS = \
 	utils.o \
 	params.o \
 	random.o \
-	randombytes.o \
-	hkdf.o \
 	format.o \
 	format-base6.o \
 	format-base10.o \
@@ -47,7 +45,9 @@ OBJS = \
 	format-hex.o \
 	format-ints.o \
 	format-random.o \
-	format-slip39.o
+	format-slip39.o \
+	randombytes.o \
+	hkdf.o
 
 LDFLAGS = -lstdc++ -lbc-crypto-base -lbc-shamir -lbc-slip39 -lbc-bip39 -largp
 

src/Makefile.in

@@ -9,19 +9,9 @@
 #include "params.hpp"
 #include "utils.hpp"
 
-void format_base10_process_output(format* f, params* p) {
-    p->output = data_to_ints(p->seed, 0, 9, "");
-}
-
-static void format_base10_dispose(format* f) {
-    free(f);
+void FormatBase10::process_input(Params* p) {
 }
 
-format* format_base10_new() {
-    format* f = (format*)calloc(sizeof(format), 1);
-    f->key = format_key_base10;
-    f->name = "base10";
-    f->process_output = format_base10_process_output;
-    f->dispose = format_base10_dispose;
-    return f;
+void FormatBase10::process_output(Params* p) {
+    p->output = data_to_ints(p->seed, 0, 9, "");
 }

src/format-base10.cpp

@@ -5,11 +5,14 @@
 //  Licensed under the "BSD-2-Clause Plus Patent License"
 //
 
-#ifndef FORMAT_BASE10_HPP
-#define FORMAT_BASE10_HPP
+#pragma once
 
 #include "format.hpp"
 
-format* format_base10_new();
+class FormatBase10 : public Format {
+   public:
+    FormatBase10() : Format(Format::Key::base10, "base10") {}
 
-#endif /* FORMAT_BASE10_HPP */
+    virtual void process_input(Params* p);
+    virtual void process_output(Params* p);
+};

src/format-base10.hpp

@@ -9,19 +9,9 @@
 #include "params.hpp"
 #include "utils.hpp"
 
-void format_base6_process_output(format* f, params* p) {
-    p->output = data_to_ints(p->seed, 0, 5, "");
-}
-
-static void format_base6_dispose(format* f) {
-    free(f);
+void FormatBase6::process_input(Params* p) {
 }
 
-format* format_base6_new() {
-    format* f = (format*)calloc(sizeof(format), 1);
-    f->key = format_key_base6;
-    f->name = "base6";
-    f->process_output = format_base6_process_output;
-    f->dispose = format_base6_dispose;
-    return f;
+void FormatBase6::process_output(Params* p) {
+    p->output = data_to_ints(p->seed, 0, 5, "");
 }

src/format-base6.cpp

@@ -5,11 +5,14 @@
 //  Licensed under the "BSD-2-Clause Plus Patent License"
 //
 
-#ifndef FORMAT_BASE6_HPP
-#define FORMAT_BASE6_HPP
+#pragma once
 
 #include "format.hpp"
 
-format* format_base6_new();
+class FormatBase6 : public Format {
+   public:
+    FormatBase6() : Format(Format::Key::base6, "base6") {}
 
-#endif /* FORMAT_BASE6_HPP */
+    virtual void process_input(Params* p);
+    virtual void process_output(Params* p);
+};

src/format-base6.hpp

@@ -13,14 +13,17 @@
 #include "params.hpp"
 #include "utils.hpp"
 
-bool format_bip39_is_seed_length_valid(size_t seed_len) {
+bool FormatBIP39::is_seed_length_valid(size_t seed_len) {
     if(!(12 <= seed_len && seed_len <= 32)) { return false; }
     if(seed_len % 2 != 0) { return false; }
     return true;
 }
 
-void format_bip39_process_output(format* f, params* p) {
-    if(!format_bip39_is_seed_length_valid(p->seed.size())) { return; }
+void FormatBIP39::process_input(Params* p) {
+}
+
+void FormatBIP39::process_output(Params* p) {
+    if(!is_seed_length_valid(p->seed.size())) { return; }
 
     size_t max_mnemonics_len = 300;
     char mnemonics[max_mnemonics_len];
@@ -29,16 +32,3 @@ void format_bip39_process_output(format* f, params* p) {
     strcpy(string, mnemonics);
     p->output = string;
 }
-
-static void format_bip39_dispose(format* f) {
-    free(f);
-}
-
-format* format_bip39_new() {
-    format* f = (format*)calloc(sizeof(format), 1);
-    f->key = format_key_bip39;
-    f->name = "bip39";
-    f->process_output = format_bip39_process_output;
-    f->dispose = format_bip39_dispose;
-    return f;
-}

src/format-bip39.cpp

@@ -5,15 +5,19 @@
 //  Licensed under the "BSD-2-Clause Plus Patent License"
 //
 
-#ifndef FORMAT_BIP39_HPP
-#define FORMAT_BIP39_HPP
-
-#include "format.hpp"
+#pragma once
 
 #include <stdbool.h>
 #include <stdlib.h>
 
-format* format_bip39_new();
-bool format_bip39_is_seed_length_valid(size_t seed_len);
+#include "format.hpp"
+
+class FormatBIP39 : public Format {
+   public:
+    FormatBIP39() : Format(Format::Key::bip39, "bip39") {}
+
+    virtual void process_input(Params* p);
+    virtual void process_output(Params* p);
 
-#endif /* FORMAT_BIP39_HPP */
+    static bool is_seed_length_valid(size_t seed_len);
+};

src/format-bip39.hpp

@@ -6,25 +6,12 @@
 //
 
 #include "format-bits.hpp"
-
-#include <strings.h>
-
 #include "params.hpp"
 #include "utils.hpp"
 
-void format_bits_process_output(format* f, params* p) {
-    p->output = data_to_ints(p->seed, 0, 1, "");
-}
-
-static void format_bits_dispose(format* f) {
-    free(f);
+void FormatBits::process_input(Params* p) {
 }
 
-format* format_bits_new() {
-    format* f = (format*)calloc(sizeof(format), 1);
-    f->key = format_key_bits;
-    f->name = "bits";
-    f->process_output = format_bits_process_output;
-    f->dispose = format_bits_dispose;
-    return f;
+void FormatBits::process_output(Params* p) {
+    p->output = data_to_ints(p->seed, 0, 1, "");
 }