===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/speed.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/usr.bin/openssl/speed.c	2015/01/03 03:03:39	1.4
+++ src/usr.bin/openssl/speed.c	2015/02/08 10:22:45	1.5
@@ -1,4 +1,4 @@
-/* $OpenBSD: speed.c,v 1.4 2015/01/03 03:03:39 lteo Exp $ */
+/* $OpenBSD: speed.c,v 1.5 2015/02/08 10:22:45 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -675,12 +675,6 @@
 			doit[D_CBC_256_CML] = 1;
 		else
 #endif
-#if 0				/* was: #ifdef RSAref */
-		if (strcmp(*argv, "rsaref") == 0) {
-			RSA_set_default_openssl_method(RSA_PKCS1_RSAref());
-			j--;
-		} else
-#endif
 #ifndef RSA_NULL
 		if (strcmp(*argv, "openssl") == 0) {
 			RSA_set_default_method(RSA_PKCS1_SSLeay());
@@ -1004,15 +998,6 @@
 			BIO_printf(bio_err, "internal error loading RSA key number %d\n", i);
 			goto end;
 		}
-#if 0
-		else {
-			BIO_printf(bio_err, mr ? "+RK:%d:"
-			    : "Loaded RSA key, %d bit modulus and e= 0x",
-			    BN_num_bits(rsa_key[i]->n));
-			BN_print(bio_err, rsa_key[i]->e);
-			BIO_printf(bio_err, "\n");
-		}
-#endif
 	}
 
 	dsa_key[0] = get_dsa512();
@@ -1501,7 +1486,6 @@
 			rsa_count = count;
 		}
 
-#if 1
 		ret = RSA_verify(NID_md5_sha1, buf, 36, buf2, rsa_num, rsa_key[j]);
 		if (ret <= 0) {
 			BIO_printf(bio_err, "RSA verify failure.  No RSA verify will be done.\n");
@@ -1529,7 +1513,6 @@
 			    count, rsa_bits[j], d);
 			rsa_results[j][1] = d / (double) count;
 		}
-#endif
 
 		if (rsa_count <= 1) {
 			/* if longer than 10s, don't do any more */
@@ -1624,9 +1607,8 @@
 			ERR_print_errors(bio_err);
 			rsa_count = 1;
 		} else {
-#if 1
 			EC_KEY_precompute_mult(ecdsa[j], NULL);
-#endif
+
 			/* Perform ECDSA signature test */
 			EC_KEY_generate_key(ecdsa[j]);
 			ret = ECDSA_sign(0, buf, 20, ecdsasig,