rho.cc: Hoist `hex output' to the top.

[rhodes] / rho.cc

diff --git a/rho.cc b/rho.cc
index 651211ad4f7ba36e9293f8b9ecac16ba252d203f..087a33118e8da43c78a1caa54c56e534ccaef663 100644 (file)
--- a/rho.cc
+++ b/rho.cc
@@ -162,6 +162,7 @@ int main(int argc, char *argv[])
   ssize_t n;
 
   prog = argv[0];
+  NTL::GF2X::HexOutput = 1;
 
   if (argc != 7) {
     std::fprintf(stderr, "usage: %s DPBITS gf2x P A B L\n",
@@ -184,8 +185,6 @@ int main(int argc, char *argv[])
   if (!ProbPrime(l)) barf("order isn't prime", 0);
   NTL::ZZ_p::init(l);
 
-  NTL::GF2X::HexOutput = 1;
-
   if (power(a, l) != 1) barf("a has wrong order", 0);
   if (power(b, l) != 1) barf("b has wrong order", 0);
 
@@ -228,7 +227,8 @@ again:
   unsigned long long k = 0;
 
   if (!dpbits)
-    for (i = 0; i < NHIST; i++) h[i].k = 0;
+    for (i = 0; i < NHIST; i++)
+      { h[i].k = 0; h[i].y = a; h[i].u = 1; h[i].v = 0; }
 
   for (;;) {
     if (k >= niter) goto again;