Barrett versions of modsq/modmul/modexp, with tests.

src/unsigned/modsq.rs

@@ -3,7 +3,7 @@ pub trait ModSquare<T> {
 }
 
 macro_rules! modsq_impls {
-    ($name: ident, $dbl: ident) => {
+    ($name: ident, $dbl: ident, $barrett: ident) => {
         impl ModSquare<$name> for $name {
             fn modsq(&self, m: &$name) -> $name {
                 let bigsquare = self.square();
@@ -12,6 +12,13 @@ macro_rules! modsq_impls {
                 $name::from(res)
             }
         }
+
+        impl ModSquare<$barrett> for $name {
+            fn modsq(&self, m: &$barrett) -> $name {
+                let bigsquare = self.square();
+                m.reduce(&bigsquare)
+            }
+        }
     };
 }
 
@@ -21,7 +28,7 @@ macro_rules! generate_modsq_tests {
         #[test]
         fn $lname() {
             let fname = format!("testdata/modsq/{}.tests", stringify!($name));
-            run_test(fname.to_string(), 3, |case| {
+            run_test(fname.to_string(), 5, |case| {
                 let (neg0, abytes) = case.get("a").unwrap();
                 let (neg1, mbytes) = case.get("m").unwrap();
                 let (neg2, cbytes) = case.get("c").unwrap();
@@ -34,4 +41,34 @@ macro_rules! generate_modsq_tests {
             });
         }
     };
+}
+
+#[cfg(test)]
+macro_rules! generate_barrett_modsq_tests {
+    ($name: ident, $lname: ident, $bname: ident) => {
+        #[test]
+        fn $lname() {
+            let fname = format!("testdata/modsq/{}.tests", stringify!($name));
+            run_test(fname.to_string(), 5, |case| {
+                let (neg0, abytes) = case.get("a").unwrap();
+                let (neg1, mbytes) = case.get("m").unwrap();
+                let (neg2, cbytes) = case.get("c").unwrap();
+                let (neg3, kbytes) = case.get("k").unwrap();
+                let (neg4, ubytes) = case.get("u").unwrap();
+                assert!(!neg0 && !neg1 && !neg2 && !neg3 && !neg4);
+
+                let a    = $name::from_bytes(abytes);
+                let m    = $name::from_bytes(mbytes);
+                let c    = $name::from_bytes(cbytes);
+                let kbig = $name::from_bytes(kbytes);
+                let k    = usize::from(kbig);
+                let mu   = $bname::from_bytes(ubytes);
+                let bar  = $name::new_barrett(k, $bname::from(m), mu);
+
+                if k == a.value.len() {
+                    assert_eq!(c, a.modsq(&bar));
+                }
+            });
+        }
+    };
 }