Fix GarbleProgram::literal_arg for arrays with const size

sine-fdn · May 29, 2024 · 4560671 · 4560671
1 parent d8c210d
commit 4560671
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/eval.rs b/src/eval.rs
@@ -222,7 +222,7 @@ impl<'a> Evaluator<'a> {
     }
 }
 
-fn resolve_const_type(ty: &Type, const_sizes: &HashMap<String, usize>) -> Type {
+pub(crate) fn resolve_const_type(ty: &Type, const_sizes: &HashMap<String, usize>) -> Type {
     match ty {
         Type::Fn(params, ret_ty) => Type::Fn(
             params

diff --git a/src/lib.rs b/src/lib.rs
@@ -45,7 +45,7 @@ use ast::{Expr, FnDef, Pattern, Program, Stmt, Type};
 use check::TypeError;
 use circuit::Circuit;
 use compile::CompilerError;
-use eval::{EvalError, Evaluator};
+use eval::{resolve_const_type, EvalError, Evaluator};
 use literal::Literal;
 use parse::ParseError;
 use scan::{scan, ScanError};
@@ -162,8 +162,9 @@ impl GarbleProgram {
         let Some(param) = self.main.params.get(arg_index) else {
             return Err(EvalError::InvalidArgIndex(arg_index));
         };
-        if !literal.is_of_type(&self.program, &param.ty) {
-            return Err(EvalError::InvalidLiteralType(literal, param.ty.clone()));
+        let ty = resolve_const_type(&param.ty, &self.const_sizes);
+        if !literal.is_of_type(&self.program, &ty) {
+            return Err(EvalError::InvalidLiteralType(literal, ty));
         }
         Ok(GarbleArgument(literal, &self.program, &self.const_sizes))
     }