MxCir update and fixes

ladnir · Apr 5, 2024 · c09f5f5 · c09f5f5
1 parent 1ffddc5
commit c09f5f5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/cryptoTools/Circuit/MxCircuit.h b/cryptoTools/Circuit/MxCircuit.h
@@ -130,7 +130,7 @@ namespace osuCrypto
 		public:
 
 			Circuit() = default;
-			Circuit(Circuit&&) = delete;
+			Circuit(Circuit&&) = default;
 			Circuit(const Circuit&) = delete;
 
 			enum ValueType
@@ -414,6 +414,12 @@ namespace osuCrypto
 
 			void evaluate(const std::vector<BitVector>& in, std::vector<BitVector>& out)
 			{
+
+				if (mInputs.size() == 0)
+					throw std::runtime_error("MxCircuit::evaluate(...), zero inputs to cirucit. " LOCATION);
+				if (mOutputs.size() == 0)
+					throw std::runtime_error("MxCircuit::evaluate(...), zero output from cirucit. " LOCATION);
+
 				if (in.size() != mInputs.size())
 					throw std::runtime_error("MxCircuit::evaluate(...), number of inputs provided is not correct. " LOCATION);
 				out.resize(mOutputs.size());

diff --git a/cryptoTools/Circuit/MxTypes.h b/cryptoTools/Circuit/MxTypes.h
@@ -197,6 +197,10 @@ namespace osuCrypto
 			std::vector<Bit>& asBits() { return *this; }
 			const std::vector<Bit>& asBits() const { return *this; }
 
+			static BVector makeFromSize(u64 s)
+			{
+				return BVector(s);
+			}
 		};
 
 		// a crtp that implement the integer operations for type C.