wNaf Edwards twisted torsion 16

Author: cherubrock-seb

include/core/Version.hpp

@@ -4,7 +4,7 @@
 #include <string>
 
 namespace core {
-    const std::string PRMERS_VERSION = "4.15.25-alpha";
+    const std::string PRMERS_VERSION = "4.15.26-alpha";
 } // namespace core
 
 #endif // VERSION_HPP

include/io/CliParser.hpp

@@ -34,9 +34,9 @@ struct CliOptions {
     uint64_t gerbicz_error_count = 0;
     uint64_t erroriter = 0;
     bool proof = true;
-    bool edwards = true;
+    bool edwards = false;
     bool compute_edwards = false;
-    bool torsion16 = true;
+    bool torsion16 = false;
     bool notorsion = false;
     uint64_t sigma = 0ULL;
     uint64_t seed = 0ULL;

src/io/CliParser.cpp

@@ -82,11 +82,12 @@ void printUsage(const char* progName) {
     std::cout << "  -checklevel <value>  : (Optional) Will force gerbicz check every B*<value> by default check is done every 10 min and at the end." << std::endl;
     std::cout << "  -wagstaff            : (Optional) will check PRP if (2^p + 1)/3 is probably prime" << std::endl;
     std::cout << "  -ecm -b1 <B1> [-b2 <B2>] -K <curves> : Run ECM factoring with bounds B1 [and optional B2], on given number of curves" << std::endl;
-    std::cout << "  -montgomery          : (Optional) use Montgomery instead of twisted Edwards curve (compute done in montgomery)" << std::endl;
-    std::cout << "  -edwards             : (Optional) use twisted Edwards curve converted to Montgomery (compute done in Montgomery)" << std::endl;
-    std::cout << "  -ced                 : (Optional) use twisted Edwards compute (notorsion or torsion 2x8 possible) " << std::endl;
+    std::cout << "  -montgomery          : (Optional) compute in Montgomery and use Montgomery (compute done in montgomery)" << std::endl;
+    std::cout << "  -edwards             : (Optional) compute in Montgomery and use (twisted) Edwards curve converted to Montgomery (compute done in Montgomery)" << std::endl;
+    std::cout << "  -ced                 : (Optional) compute in Edwards and use (twisted) Edwards curves (notorsion twisted or torsion 2x8 possible no twist a=1) " << std::endl;
     std::cout << "  -seed                : (Optional) force a curve seed" << std::endl;
-    std::cout << "  -torsion8            : (Optional) use torsion-8 instead of default torsion-16" << std::endl;
+    std::cout << "  -torsion8            : (Optional) use torsion-8" << std::endl;
+    std::cout << "  -torsion16           : (Optional) use torsion-16" << std::endl;
     std::cout << "  -notorsion           : (Optional) use no torsion instead of default torsion-16" << std::endl;
 
     //std::cout << "  -brent [<d>]         : (Optional) use Brent-Suyama variant with default or specified degree d (e.g., -brent 6)" << std::endl;
@@ -203,10 +204,14 @@ CliOptions CliParser::parse(int argc, char** argv ) {
         }
         else if (std::strcmp(argv[i], "-ced") == 0) {
             opts.compute_edwards = true;
+            opts.torsion16 = true;
         }
         else if (std::strcmp(argv[i], "-torsion8") == 0) {
             opts.torsion16 = false;
         }
+        else if (std::strcmp(argv[i], "-torsion16") == 0) {
+            opts.torsion16 = true;
+        }
         else if (std::strcmp(argv[i], "-notorsion") == 0) {
             opts.notorsion = true;
         }

src/modes/RunEcm.cpp

@@ -138,7 +138,7 @@ int App::runECMMarin()
     if (forceSigma || options.notorsion) pm_effective = options.edwards ? 3 : 0;
     else if (options.torsion16) pm_effective = options.edwards ? 4 : 1;
     else pm_effective = options.edwards ? 5 : 2;
-    mode_name = ((pm_effective==0||pm_effective==1||pm_effective==2) ? "montgomery" : "edwards");
+    mode_name = ((pm_effective==0||pm_effective==1||pm_effective==2) ? "montgomery" : "edwards--conv-->montgomery");
     if (pm_effective==0 || pm_effective==3) torsion_name = "none";
     else if (pm_effective==1 || pm_effective==4) torsion_name = "16";
     else torsion_name = "8";
@@ -393,7 +393,7 @@ int App::runECMMarin()
                 gp<<"A=lift(modN(-((4*v+1)^2+16*v)));\n";
                 gp<<"A24=lift(modN((A+2)/4));\n";
                 gp<<"x0=lift(modN(4*v+1));\n";
-            } else if (mode=="edwards") {
+            } else if (mode=="edwards--conv-->montgomery") {
                 gp<<"aE="<<(aE_opt? aE_opt->get_str() : "0")<<"; dE="<<(dE_opt? dE_opt->get_str() : "0")<<";\n";
                 gp<<"A=lift(modN(2*(aE+dE)/(aE-dE)));\n";
                 gp<<"A24=lift(modN((A+2)/4));\n";
@@ -430,7 +430,7 @@ int App::runECMMarin()
         mpz_class A24, x0;
 
         if (resume_stage2) {
-            if (pm_effective==0 || pm_effective==1 || pm_effective==2) mode_name="montgomery"; else mode_name="edwards";
+            if (pm_effective==0 || pm_effective==1 || pm_effective==2) mode_name="montgomery"; else mode_name="edwards--conv-->montgomery";
             if (pm_effective==0 || pm_effective==3) torsion_name="none"; else if (pm_effective==1 || pm_effective==4) torsion_name="16"; else torsion_name="8";
         }
         //test case ./prmers 127913 -ecm -b1 50000 -seed 15236911113677539612
@@ -641,7 +641,7 @@ int App::runECMMarin()
             }
             else if (picked_mode == 3)
             {
-                mode_name="edwards"; torsion_name="none";
+                mode_name="edwards--conv-->montgomery"; torsion_name="none";
                 mpz_class sigma_mpz;
                 if (forceSigma){
                     curve_seed = options.curve_seed;
@@ -665,13 +665,13 @@ int App::runECMMarin()
                 mpz_class aE = addm(A, mpz_class(2));
                 mpz_class dE = subm(A, mpz_class(2));
                 std::ostringstream head;
-                head<<"[ECM] Curve "<<(c+1)<<"/"<<curves<<" | edwards | torsion=none | K_bits="<<mpz_sizeinbase(K.get_mpz_t(),2)<<" | seed="<<base_seed;
+                head<<"[ECM] Curve "<<(c+1)<<"/"<<curves<<" | edwards --conv-->montgomery  | torsion=none | K_bits="<<mpz_sizeinbase(K.get_mpz_t(),2)<<" | seed="<<base_seed;
                 std::cout<<head.str()<<std::endl; if (guiServer_) guiServer_->appendLog(head.str());
-                write_gp("edwards","none", N, p, B1, B2, base_seed, curve_seed, nullptr, nullptr, nullptr, &aE, &dE, A24, x0);
+                write_gp("edwards--conv-->montgomery","none", N, p, B1, B2, base_seed, curve_seed, nullptr, nullptr, nullptr, &aE, &dE, A24, x0);
             }
             else
             {
-                mode_name="edwards"; torsion_name="8";
+                mode_name="edwards--conv-->montgomery"; torsion_name="8";
                 if (forceSigma){
                     curve_seed = options.curve_seed;
                 }
@@ -690,9 +690,9 @@ int App::runECMMarin()
                 mpz_class aE = addm(A, mpz_class(2));
                 mpz_class dE = subm(A, mpz_class(2));
                 std::ostringstream head;
-                head<<"[ECM] Curve "<<(c+1)<<"/"<<curves<<" | edwards | torsion=8 | K_bits="<<mpz_sizeinbase(K.get_mpz_t(),2)<<" | seed="<<base_seed;
+                head<<"[ECM] Curve "<<(c+1)<<"/"<<curves<<" | edwards --conv-->montgomery  | torsion=8 | K_bits="<<mpz_sizeinbase(K.get_mpz_t(),2)<<" | seed="<<base_seed;
                 std::cout<<head.str()<<std::endl; if (guiServer_) guiServer_->appendLog(head.str());
-                write_gp("edwards","8", N, p, B1, B2, base_seed, curve_seed, nullptr, nullptr, &v, &aE, &dE, A24, x0);
+                write_gp("edwards--conv-->montgomery","8", N, p, B1, B2, base_seed, curve_seed, nullptr, nullptr, &v, &aE, &dE, A24, x0);
             }
 
             mpz_t zA24; mpz_init(zA24); mpz_set(zA24, A24.get_mpz_t()); eng->set_mpz((engine::Reg)6, zA24); mpz_clear(zA24);