finished speed.c

1 files changed, 12 insertions, 8 deletions

diff --git a/apps/speed.c b/apps/speed.c
index f13fb54e36..6201d17934 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1018,6 +1018,7 @@ int speed_main(int argc, char **argv)
 		}
 	}
 
+	/* Remaining arguments are algorithms. */
 	argc = opt_num_rest();
 	for (argv = opt_rest(); *argv; argv++) {
 		if (strcmp(*argv, "prime") == 0) {
@@ -1090,27 +1091,30 @@ int speed_main(int argc, char **argv)
 		}
 #endif
 #ifndef OPENSSL_NO_ECDSA
-		if (found(*argv, ecdsa_choices, &i)) {
-			ecdsa_doit[i] = 2;
-			continue;
-		}
 		if (strcmp(*argv, "ecdsa") == 0) {
 			for (i = 0; i < EC_NUM; i++)
 				ecdsa_doit[i] = 1;
 			continue;
 		}
-#endif
-#ifndef OPENSSL_NO_ECDH
-		if (found(*argv, ecdh_choices, &i)) {
-			ecdh_doit[i] = 2;
+		if (found(*argv, ecdsa_choices, &i)) {
+			ecdsa_doit[i] = 2;
 			continue;
 		}
+#endif
+#ifndef OPENSSL_NO_ECDH
 		if (strcmp(*argv,"ecdh") == 0) {
 			for (i = 0; i < EC_NUM; i++)
 				ecdh_doit[i] = 1;
 			continue;
 		}
+		if (found(*argv, ecdh_choices, &i)) {
+			ecdh_doit[i] = 2;
+			continue;
+		}
 #endif
+		BIO_printf(bio_err, "%s: Unknown algorithm %s\n",
+				prog, *argv);
+		goto end;
 	}
 
 #ifndef NO_FORK