Ensure s < r in tests and setup.rs

ralexstokes · Feb 22, 2021 · 5bc79de · 5bc79de
1 parent e80201a
commit 5bc79de
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 18 deletions.
diff --git a/src/commitment.rs b/src/commitment.rs
@@ -180,46 +180,88 @@ mod tests {
                 "95c2663b029a933ca94f346061b52dfc85da11386c9aaffe2b604a00589299c10b0855f90c5f7db31cc1cc45353dc948",
             ),
             (
-                "f90b6bfdb2f26a3d8ca62b71bb1cb4db6690d5cbc6de88c4ba11ff1fc00c3876",
+                "0b598c0727a94e556b8c1dcb64af40daea6971901b5dcb8b49da2fe2b533a52e",
                 vec![0],
-                0 ,
+                0,
                 "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                 "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             ),
             (
-                "f90b6bfdb2f26a3d8ca62b71bb1cb4db6690d5cbc6de88c4ba11ff1fc00c3876",
+                "0b598c0727a94e556b8c1dcb64af40daea6971901b5dcb8b49da2fe2b533a52e",
                 vec![11],
-                11 ,
+                11,
                 "80fd75ebcc0a21649e3177bcce15426da0e4f25d6828fbf4038d4d7ed3bd4421de3ef61d70f794687b12b2d571971a55",
                 "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             ),
             (
-                "f90b6bfdb2f26a3d8ca62b71bb1cb4db6690d5cbc6de88c4ba11ff1fc00c3876",
+                "0b598c0727a94e556b8c1dcb64af40daea6971901b5dcb8b49da2fe2b533a52e",
                 vec![0, 1],
-                15 ,
-                "b43e5c8916759f302ce05430a147cbac51ce1ed763a732b09f48b4abd0f291a5e82c254a532d6d1e6f3eeb41a37cefbb",
+                15,
+                "b6464852dee959d00049ce3630a863d5226309fc9cdcb50d991b571a4e8b2f55c61955045918ab4bd6c0460a01fedfe0",
                 "97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb",
             ),
             (
-                "f90b6bfdb2f26a3d8ca62b71bb1cb4db6690d5cbc6de88c4ba11ff1fc00c3876",
+                "0b598c0727a94e556b8c1dcb64af40daea6971901b5dcb8b49da2fe2b533a52e",
                 vec![1, 12],
-                181 ,
-                "a9290ebea935358a73dccb511c24f4bd81d7451b834bc56eae49257b0cab5ac36c10525910bbde664cb39de7c8aaf995",
+                181,
+                "adea87ebbba6c937d96ea9bac45a5de282b17bce08e40ab6ed358e2eedda5a0e667a9a744d1369b6e7ffe049686261de",
                 "8345dd80ffef0eaec8920e39ebb7f5e9ae9c1d6179e9129b705923df7830c67f3690cbc48649d4079eadf5397339580c",
             ),
             (
-                "f90b6bfdb2f26a3d8ca62b71bb1cb4db6690d5cbc6de88c4ba11ff1fc00c3876",
+                "0b598c0727a94e556b8c1dcb64af40daea6971901b5dcb8b49da2fe2b533a52e",
                 vec![1, 2, 2],
-                481 ,
-                "a9754fe6de9d2e8bc2702501f8ee86adf2dd83bad7150c794ee1382716a47d78e34e2acf6f01f92e4a4af7ec28154503",
-                "95892cd75d24e865d739c63e7874a9e1810c44e1ffa4eeb197ba70717daad2b4b4a4ee7742a28754f1cb35a178417b00",
+                481,
+                "b3e43da9f207cb9d717f85d40b967a28254b22bb6269b551aed50444eb1aed7f93a2b519acd7076e56451dc084389323",
+                "b8cea544c0d68bf429533df6126a3f9a3ce9027595df4e7fc1e00a368f8b92690251434e51a9b53b35e8e9677960e0b1",
             ),
             (
-                "f90b6bfdb2f26a3d8ca62b71bb1cb4db6690d5cbc6de88c4ba11ff1fc00c3876",
+                "0b598c0727a94e556b8c1dcb64af40daea6971901b5dcb8b49da2fe2b533a52e",
                 vec![1, 2, 3, 4, 7, 7, 7, 7, 13, 13, 13, 13, 13, 13, 13, 13],
-                6099236329206434206 ,
-                "8dcb3189ff1b845a2e4dbb5859a95b4f3fa0a63aa86e41619ec0616c70cf45869b1ae4e1e9e387947e43242827a6642d",
-                "97a532e00dc2504f060506580d450b5293ac7e17a358018e01242b39357b45e1b2527c4b28ca0a3ccf0149da4bc69292",
+                6099236329206434206,
+                "970d3aa5cad4492adb0c87c1f9ee4a82e48a59777d66868827080c145e4562995348af9a486b59f7bdf62a7c25c7159f",
+                "b37b9247ff4965586a6e6bb0c5634e34865c233c5c2efc123410fa9f536da2d258c816d3b2db7a3c9c54311837fea7ac",
+            ),
+            (
+                "57a29351ad759e70ac84de21c4a5a54780b46b1a7cfc5bfa033e3b9321562bce",
+                vec![0],
+                0,
+                "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            ),
+            (
+                "57a29351ad759e70ac84de21c4a5a54780b46b1a7cfc5bfa033e3b9321562bce",
+                vec![11],
+                11,
+                "80fd75ebcc0a21649e3177bcce15426da0e4f25d6828fbf4038d4d7ed3bd4421de3ef61d70f794687b12b2d571971a55",
+                "c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            ),
+            (
+                "57a29351ad759e70ac84de21c4a5a54780b46b1a7cfc5bfa033e3b9321562bce",
+                vec![0, 1],
+                15,
+                "94976e86763f440d1338d7c17d181c027630dc39a1d648068683d228300b1085d0c4fbfd9f6f308cda71fdd641834a36",
+                "97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb",
+            ),
+            (
+                "57a29351ad759e70ac84de21c4a5a54780b46b1a7cfc5bfa033e3b9321562bce",
+                vec![1, 12],
+                181,
+                "a2dffe3cfef260770472215a66689c0ad35d2fd5868ea369e1a65c47c1cabdb1786a8e5763021b0cac33f458650e80ce",
+                "8345dd80ffef0eaec8920e39ebb7f5e9ae9c1d6179e9129b705923df7830c67f3690cbc48649d4079eadf5397339580c",
+            ),
+            (
+                "57a29351ad759e70ac84de21c4a5a54780b46b1a7cfc5bfa033e3b9321562bce",
+                vec![1, 2, 2],
+                481,
+                "a8372e96e8db620e5a5a359f884aea597f358ba9b54d3bf36c712e241dc612e2a7fa81efe3159b2eff19c84b0b7f31f5",
+                "acb40f1a984eba565dc9025284fc32f58e01f4bc1af92edbe8114151057998c45da684e50563a2a0a2660d374d851a2f",
+            ),
+            (
+                "57a29351ad759e70ac84de21c4a5a54780b46b1a7cfc5bfa033e3b9321562bce",
+                vec![1, 2, 3, 4, 7, 7, 7, 7, 13, 13, 13, 13, 13, 13, 13, 13],
+                6099236329206434206,
+                "81cdc95341621862ebf968daf2760c5412beecb06d272d276a007e1a9c0355f2b053c7bb3e1569366ab7e1b414c5af2e",
+                "89e2eb1c44cc5ad3337562570c9940737a1e006a0148f7982c8f3c99bf6484cba0b86edc082b5b90da4190b588c3a3bb",
             ),
         ];
 

diff --git a/src/setup.rs b/src/setup.rs
@@ -11,6 +11,9 @@ pub struct Setup {
 pub fn generate(secret: &[u8; 32], degree: usize) -> Setup {
     let modulus = constants::get_modulus();
     let s = BigUint::from_bytes_be(secret);
+
+    assert!(s < constants::get_modulus(), "secret must be less than r");
+
     let mut points_in_g1 = vec![];
 
     unsafe {