keygen works

2 files changed, 12 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index e2ed920..697e134 100644
--- a/Makefile
+++ b/Makefile
@@ -32,4 +32,4 @@ miller_rabin.o: %.o: %.cpp %.h
 .PHONY: clean
 
 clean:
-	rm -f ./$(OBJS1) ./$(PROG1)
+	rm -f ./$(OBJS1) ./$(PROG1) ./*.xml
diff --git a/keygen.cpp b/keygen.cpp
index 24aa12a..c91d612 100644
--- a/keygen.cpp
+++ b/keygen.cpp
@@ -52,6 +52,7 @@ int main(int argc, char **argv)
 
     if (random_f)
     {
+        printf("generating random primes...\n");
         prime_p = gen_prime();
         printf("generated p: %hu\n", (unsigned short) prime_p);
 
@@ -74,7 +75,7 @@ int main(int argc, char **argv)
     unsigned long e;
     /* find e, 1 < e < phi, such that gcd(e, phi) = 1 */
     int i;
-    fprintf(stdout, "computing e... ");
+    printf("computing e... ");
     for (i = 0; i < 4; i++)
     {
         e = fermat_primes[i];
@@ -86,22 +87,23 @@ int main(int argc, char **argv)
         fprintf(stderr, "error, could not find e\n");
         exit(EXIT_FAILURE);
     }
-    fprintf(stdout, "done\n");
+    printf("done\n");
 
     /* find d */
+    printf("computing d... ");
+    fflush(stdout);
     unsigned long d = 1;
-    fprintf(stdout, "computing d... ");
     while (1)
     {
         if ( (e*d - 1) / phi )
             break;
-        else
-            d++;
+
+        d++;
     }
-    fprintf(stdout, "done\n");
+    printf("done\n");
 
 #ifdef DEBUG
-    fprintf(stdout, "debug: pubkey = \"%s\"\n"
+    printf("debug: pubkey = \"%s\"\n"
                     "       prikey = \"%s\"\n"
                     "       p      = \"%ld\"\n"
                     "       q      = \"%ld\"\n"
@@ -125,13 +127,13 @@ int main(int argc, char **argv)
     fprintf(public_key, "\t<evalue>%lu</evalue>\n", e);
     fprintf(public_key, "\t<nvalue>%lu</nvalue>\n", n);
     fprintf(public_key, "</rsakey>\n");
-    fprintf(stdout, "wrote \"%s\" file\n", pubkey);
+    printf("wrote \"%s\" file\n", pubkey);
 
     fprintf(private_key, "<rsakey>\n");
     fprintf(private_key, "\t<dvalue>%lu</dvalue>\n", d);
     fprintf(private_key, "\t<nvalue>%lu</nvalue>\n", n);
     fprintf(private_key, "</rsakey>\n");
-    fprintf(stdout, "wrote \"%s\" file\n", prikey);
+    printf("wrote \"%s\" file\n", prikey);
 
     fclose(public_key);
     fclose(private_key);