updated to new cryptanalysislib version

FloydZ · Aug 20, 2024 · ffe3a36 · ffe3a36
1 parent 62f7837
commit ffe3a36
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 33 deletions.
diff --git a/deps/cryptanalysislib b/deps/cryptanalysislib
diff --git a/src/bjmm.h b/src/bjmm.h
@@ -1,7 +1,7 @@
 #ifndef DECODING_BJMM_H
 #define DECODING_BJMM_H
 
-#include "matrix/binary_matrix.h"
+#include "matrix/matrix.h"
 #include "container/hashmap.h"
 #include "popcount/popcount.h"
 #include "math/bc.h"
@@ -120,8 +120,8 @@ class BJMM : public ISDInstance<uint64_t, isd> {
 	constexpr static SimpleHashMapConfig simpleHashMapConfigD2 {
 			HM2_bucketsize, HM2_nrbuckets, config.threads
 	};
-	using HM1 = SimpleHashMap<keyType, V1, simpleHashMapConfig, Hash<l_type, 0, l1>>;
-	using HM2 = SimpleHashMap<keyType, V2, simpleHashMapConfigD2, Hash<l_type, 0, l2>>;
+	using HM1 = SimpleHashMap<keyType, V1, simpleHashMapConfig, Hash<l_type, 0, l1, 2>>;
+	using HM2 = SimpleHashMap<keyType, V2, simpleHashMapConfigD2, Hash<l_type, 0, l2, 2>>;
 	HM1 *hm1; HM2 *hm2;
 
 	constexpr static ConfigEnumHashMap configEnum{config};

diff --git a/src/fq/prange.h b/src/fq/prange.h
@@ -4,7 +4,7 @@
 #include "combination/chase.h"
 #include "helper.h"
 #include "container/fq_vector.h"
-#include "matrix/fq_matrix.h"
+#include "matrix/matrix.h"
 #include "list/list.h"
 #include "list/enumeration/fq.h"
 #include "thread/thread.h"
@@ -116,8 +116,8 @@ class FqPrange : public ISDInstance<uint64_t, config> {
 
 				/// start the iterations
 				bool found = G.template run
-				             <std::nullptr_t, std::nullptr_t>
-				             (nullptr, nullptr, 0, tid, nullptr, nullptr, &predicate);
+				             <std::nullptr_t, std::nullptr_t, decltype(predicate)>
+				             (nullptr, nullptr, 0, 0, tid, nullptr, nullptr, &predicate);
 
 				if (unlikely(found)) {
 					not_found = false;

diff --git a/src/fq/sieving.h b/src/fq/sieving.h
@@ -3,7 +3,7 @@
 
 #include "helper.h"
 #include "container/fq_vector.h"
-#include "matrix/fq_matrix.h"
+#include "matrix/matrix.h"
 #include "list/list.h"
 #include "list/enumeration/fq.h"
 #include "sort.h"

diff --git a/src/fq/stern.h b/src/fq/stern.h
@@ -3,9 +3,8 @@
 
 #include "helper.h"
 #include "container/fq_vector.h"
-#include "matrix/fq_matrix.h"
+#include "matrix/matrix.h"
 #include "list/list.h"
-#include "list/enumeration/fq.h"
 #include "sort.h"
 #include "popcount/popcount.h"
 #include "mitm.h"
@@ -51,7 +50,8 @@ class FqStern : public ISDInstance<uint64_t, isd> {
 	constexpr static uint32_t enum_length = (k + l) >> 1u;
 	constexpr static uint32_t enum_offset = k + l - enum_length;
 	constexpr static size_t list_size = compute_combinations_fq_chase_list_size<enum_length, q, p>();
-	using List = Parallel_List_FullElement_T<Element>;
+	// using List = Parallel_List_FullElement_T<Element>;
+	using List = List_T<Element>;
 	using Generator = ListEnumerateMultiFullLength<List, enum_length, q, p>;
 	Generator G;
 	List *L1, *L2;
@@ -130,12 +130,12 @@ class FqStern : public ISDInstance<uint64_t, isd> {
 	}
 
 	///
-	inline void init_list(const uint32_t tid) {
+	inline void init_list(const uint32_t tid) noexcept {
 		hm->clear();
 
 		/// this call simply inits the the list
 		G.template run <HM, decltype(Compress), std::nullptr_t>
-				(L1, L2, enum_offset, tid, hm, &Compress);
+				(L1, L2, enum_offset, 0, tid, hm, &Compress);
 	}
 
 	void find_collisions(const uint32_t tid) {

diff --git a/src/fq/stern_v2.h b/src/fq/stern_v2.h
@@ -3,10 +3,8 @@
 
 #include "helper.h"
 #include "container/fq_vector.h"
-#include "matrix/fq_matrix.h"
+#include "matrix/matrix.h"
 #include "list/list.h"
-#include "list/enumeration/fq.h"
-#include "sort.h"
 #include "popcount/popcount.h"
 #include "mitm.h"
 #include "isd.h"

diff --git a/src/mitm.h b/src/mitm.h
@@ -3,7 +3,7 @@
 #include <tuple>
 
 #include "combination/chase.h"
-#include "matrix/binary_matrix.h"
+#include "matrix/matrix.h"
 #include "container/hashmap.h"
 #include "popcount/popcount.h"
 #include "math/bc.h"

diff --git a/src/prange.h b/src/prange.h
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include "matrix/binary_matrix.h"
+#include "matrix/matrix.h"
 #include "container/hashmap.h"
 #include "popcount/popcount.h"
 #include "math/bc.h"

diff --git a/src/stern.h b/src/stern.h
@@ -3,14 +3,15 @@
 
 #include <cstdint>
 
-#include "matrix/binary_matrix.h"
+#include "matrix/matrix.h"
 #include "container/hashmap.h"
 #include "popcount/popcount.h"
 #include "math/bc.h"
 #include "alloc/alloc.h"
 #include "hash/simple.h"
 #include "mitm.h"
 #include "isd.h"
+#include "random.h"
 
 using namespace cryptanalysislib;
 
@@ -104,7 +105,7 @@ class Stern : public ISDInstance<uint64_t, isd> {
 			bucketsize, nrbuckets, config.threads
 	};
 
-	using HM = SimpleHashMap<keyType, V1, simpleHashMapConfig, Hash<l_type, 0, l>>;
+	using HM = SimpleHashMap<keyType, V1, simpleHashMapConfig, Hash<l_type, 0, l, 2>>;
 	HM *hm;
 
 	constexpr static ConfigEnumHashMap configEnum{config};
@@ -219,8 +220,8 @@ class Stern : public ISDInstance<uint64_t, isd> {
 		for (size_t cindex = 0; cindex < final_list_current_size/8; cindex++) {
 			ASSERT(cindex < final_list_left.size());
 
-			const uint32x8_t left  = uint32x8_t::load(final_list_left256  + cindex);
-			const uint32x8_t right = uint32x8_t::load(final_list_right256 + cindex);
+			const uint32x8_t left  = uint32x8_t::load((uint32_t *)(final_list_left256  + cindex));
+			const uint32x8_t right = uint32x8_t::load((uint32_t *)(final_list_right256 + cindex));
 
 			biject_simd<baselist_enumeration_length, p>(left, rows1);
 			biject_simd<baselist_enumeration_length, p>(right, rows2);
@@ -375,4 +376,5 @@ class Stern : public ISDInstance<uint64_t, isd> {
 		          << " }" << std::endl;
 	}
 };
+
 #endif//DECODING_STERN_H
diff --git a/src/stern_im.h b/src/stern_im.h
@@ -1,6 +1,5 @@
 #ifndef DECODING_STERN_IM_H
 #define DECODING_STERN_IM_H
-
 #include <cstdint>
 
 #include "mitm.h"

diff --git a/tests/mitm.cpp b/tests/mitm.cpp
@@ -20,7 +20,7 @@ TEST(EnumHashMap, alloc) {
 	using V = CollisionType<T, uint16_t, p>;
 
 	constexpr static SimpleHashMapConfig s{.bucketsize=10u, .nrbuckets=1u<<l, .threads=1};
-	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l>>;
+	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l, 2>>;
 	HM *hm = new HM{};
 
 	static constexpr ConfigEnumHashMap config{k+l, p, l, 1};
@@ -38,7 +38,7 @@ TEST(EnumHashMap, enumeration_changelist) {
 	using V = CollisionType<T, uint16_t, p>;
 
 	constexpr static SimpleHashMapConfig s{.bucketsize=4u, .nrbuckets=1u<<l, .threads=1};
-	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l>>;
+	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l, 2>>;
 	HM *hm = new HM{};
 
 	static constexpr ConfigEnumHashMap config{k+l, p, l, 1, epsilon, false, true};
@@ -83,7 +83,7 @@ TEST(EnumHashMap, enumeration) {
 	using V = CollisionType<T, uint16_t, p>;
 
 	constexpr static SimpleHashMapConfig s{.bucketsize=10u, .nrbuckets=1u<<l, .threads=1};
-	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l>>;
+	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l, 2>>;
 	HM *hm = new HM{};
 
 	static constexpr ConfigEnumHashMap config{k+l, p, l, 1, epsilon};
@@ -117,7 +117,7 @@ TEST(EnumHashMap, enumeration_index) {
 	using V = CollisionType<T, uint32_t, 1>;
 
 	constexpr static SimpleHashMapConfig s{.bucketsize=10u, .nrbuckets=1u<<l, .threads=1};
-	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l>>;
+	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l, 2>>;
 	HM *hm = new HM{};
 
 	static constexpr ConfigEnumHashMap config{k+l, p, l, 1, true};
@@ -149,7 +149,7 @@ TEST(EnumHashMap, multithreaded_enumeration) {
 	using V = CollisionType<T, uint16_t, p>;
 
 	constexpr static SimpleHashMapConfig s{.bucketsize=10u, .nrbuckets=1u<<l, .threads=threads};
-	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l>>;
+	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l, 2>>;
 	HM *hm = new HM{};
 	hm->print();
 
@@ -190,7 +190,7 @@ TEST(CollisionHashMap, enumeration) {
 	using V = CollisionType<T, uint16_t, p>;
 
 	constexpr static SimpleHashMapConfig s{.bucketsize=10u, .nrbuckets=1u<<l, .threads=1};
-	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l>>;
+	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l, 2>>;
 	using HM_DataType = HM::data_type;
 	using HM_DataType_IndexType = HM_DataType::index_type;
 	HM *hm = new HM{};
@@ -249,7 +249,7 @@ TEST(CollisionHashMap, enumerationSIMD) {
 	using V = CollisionType<T, uint32_t, 1>;
 
 	constexpr static SimpleHashMapConfig s{.bucketsize=2u, .nrbuckets=1u<<l, .threads=1};
-	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l>>;
+	using HM = SimpleHashMap<T, V, s, Hash<T, 0, l, 2>>;
 	using HM_DataType = HM::data_type;
 	using HM_DataType_IndexType = HM_DataType::index_type;
 	HM *hm = new HM{};
@@ -348,9 +348,9 @@ TEST(CollisionHashMapD3, enumeration) {
 	constexpr static SimpleHashMapConfig s1{.bucketsize=16u, .nrbuckets=1u<<l1, .threads=threads};
 	constexpr static SimpleHashMapConfig s2{.bucketsize=12u, .nrbuckets=1u<<l2, .threads=threads};
 	constexpr static SimpleHashMapConfig s3{.bucketsize=8u,  .nrbuckets=1u<<l3, .threads=threads};
-	using HM1 = SimpleHashMap<T, V1, s1, Hash<T, 0, l1>>;
-	using HM2 = SimpleHashMap<T, V2, s2, Hash<T, 0, l2>>;
-	using HM3 = SimpleHashMap<T, V3, s3, Hash<T, 0, l3>>;
+	using HM1 = SimpleHashMap<T, V1, s1, Hash<T, 0, l1, 2>>;
+	using HM2 = SimpleHashMap<T, V2, s2, Hash<T, 0, l2, 2>>;
+	using HM3 = SimpleHashMap<T, V3, s3, Hash<T, 0, l3, 2>>;
 	HM1 *hm1 = new HM1{};
 	HM2 *hm2 = new HM2{};
 	HM3 *hm3 = new HM3{};