fmtseq structuralized

src/fmtseq.cpp

@@ -0,0 +1,21 @@
+
+/*
+ * This file is part of Codecrypt.
+ *
+ * Codecrypt is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Codecrypt is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Codecrypt. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "fmtseq.h"
+
+

src/fmtseq.h

@@ -19,6 +19,14 @@
 #ifndef _fmtseq_h_
 #define _fmtseq_h_
 
+#include <vector>
+#include <map>
+#include "types.h"
+#include "bvector.h"
+#include "sencode.h"
+#include "hash.h"
+#include "prng.h"
+
 /*
  * FMTseq - Merkle signatures with fractal tree traversal, using original
  * Lamport signatures for speed.
@@ -30,24 +38,23 @@ class privkey
 {
 public:
 	std::vector<char> SK; //secret key
-	uint h, l;
+	uint h, l; //l=level count, h=level height (root-leaf path length)
+	//therefore, H = h*l
 	uint sigs_used;
 
-	//FMT cache
+	//FMT caches
-	std::vector<std::map<uint, std::vector<char> > > node_cache;
+	std::vector<std::vector<char> > exist;
+	std::vector<std::vector<char> > desired;
+	std::vector<std::vector<char> > desired_stack;
 
 	int sign (const bvector&, bvector&, hash_func&);
 
 	uint sigs_remaining() {
-		return (1 << h) - sigs_used;
+		return (1 << () ) - sigs_used;
 	}
 
-	uint hash_size (hash_func&) {
+	uint hash_size (hash_func&hf) {
-		hf.size();
+		return hf.size() * 8;
-	}
-
-	uint signature_size (hash_func&) {
-		//TODO
 	}
 
 	sencode* serialize();
@@ -58,14 +65,12 @@ class pubkey
 {
 public:
 	std::vector<char> check; //tree top verification hash
-	uint h;
+	uint H;
 
-	uint hash_size() {
+	int verify (const bvector&, const bvector&, hash_func&);
-		return hf.size();
-	}
 
-	uint signature_size() {
+	uint hash_size (hash_func&hf) {
-		//TODO
+		return hf.size() * 8;
 	}
 
 	sencode* serialize();

src/hash.h

@@ -29,7 +29,7 @@ class hash_func
 {
 public:
 	virtual std::vector<char> operator() (const std::vector<char>&) = 0;
-	virtual uint size();
+	virtual uint size(); //in bytes
 };
 
 #endif