|
 |
1c5d99 |
diff -up openssl-1.0.1e/apps/speed.c.speed-doc openssl-1.0.1e/apps/speed.c
|
|
|
1c5d99 |
--- openssl-1.0.1e/apps/speed.c.speed-doc 2016-01-15 14:21:57.447624338 +0100
|
|
|
1c5d99 |
+++ openssl-1.0.1e/apps/speed.c 2016-01-15 14:22:37.044532716 +0100
|
|
|
1c5d99 |
@@ -628,10 +628,6 @@ int MAIN(int argc, char **argv)
|
|
|
1c5d99 |
int multi=0;
|
|
|
1c5d99 |
#endif
|
|
|
1c5d99 |
|
|
|
1c5d99 |
-#ifndef TIMES
|
|
|
1c5d99 |
- usertime=-1;
|
|
|
1c5d99 |
-#endif
|
|
|
1c5d99 |
-
|
|
|
1c5d99 |
apps_startup();
|
|
|
1c5d99 |
memset(results, 0, sizeof(results));
|
|
|
1c5d99 |
#ifndef OPENSSL_NO_DSA
|
|
|
1c5d99 |
@@ -1112,9 +1108,7 @@ int MAIN(int argc, char **argv)
|
|
|
1c5d99 |
|
|
|
1c5d99 |
BIO_printf(bio_err,"\n");
|
|
|
1c5d99 |
BIO_printf(bio_err,"Available options:\n");
|
|
|
1c5d99 |
-#if defined(TIMES) || defined(USE_TOD)
|
|
|
1c5d99 |
BIO_printf(bio_err,"-elapsed measure time in real time instead of CPU user time.\n");
|
|
|
1c5d99 |
-#endif
|
|
|
1c5d99 |
#ifndef OPENSSL_NO_ENGINE
|
|
|
1c5d99 |
BIO_printf(bio_err,"-engine e use engine e, possibly a hardware device.\n");
|
|
|
1c5d99 |
#endif
|
|
|
1c5d99 |
diff -up openssl-1.0.1e/doc/apps/speed.pod.speed-doc openssl-1.0.1e/doc/apps/speed.pod
|
|
|
1c5d99 |
--- openssl-1.0.1e/doc/apps/speed.pod.speed-doc 2013-02-11 16:26:04.000000000 +0100
|
|
|
1c5d99 |
+++ openssl-1.0.1e/doc/apps/speed.pod 2016-01-15 14:21:57.448624361 +0100
|
|
|
1c5d99 |
@@ -8,6 +8,9 @@ speed - test library performance
|
|
|
1c5d99 |
|
|
|
1c5d99 |
B<openssl speed>
|
|
|
1c5d99 |
[B<-engine id>]
|
|
|
1c5d99 |
+[B<-elapsed>]
|
|
|
1c5d99 |
+[B<-evp algo>]
|
|
|
1c5d99 |
+[B<-decrypt>]
|
|
|
1c5d99 |
[B<md2>]
|
|
|
1c5d99 |
[B<mdc2>]
|
|
|
1c5d99 |
[B<md5>]
|
|
|
1c5d99 |
@@ -49,6 +52,19 @@ to attempt to obtain a functional refere
|
|
|
1c5d99 |
thus initialising it if needed. The engine will then be set as the default
|
|
|
1c5d99 |
for all available algorithms.
|
|
|
1c5d99 |
|
|
|
1c5d99 |
+=item B<-elapsed>
|
|
|
1c5d99 |
+
|
|
|
1c5d99 |
+Measure time in real time instead of CPU time. It can be useful when testing
|
|
|
1c5d99 |
+speed of hardware engines.
|
|
|
1c5d99 |
+
|
|
|
1c5d99 |
+=item B<-evp algo>
|
|
|
1c5d99 |
+
|
|
|
1c5d99 |
+Use the specified cipher or message digest algorithm via the EVP interface.
|
|
|
1c5d99 |
+
|
|
|
1c5d99 |
+=item B<-decrypt>
|
|
|
1c5d99 |
+
|
|
|
1c5d99 |
+Time the decryption instead of encryption. Affects only the EVP testing.
|
|
|
1c5d99 |
+
|
|
|
1c5d99 |
=item B<[zero or more test algorithms]>
|
|
|
1c5d99 |
|
|
|
1c5d99 |
If any options are given, B<speed> tests those algorithms, otherwise all of
|