1 files changed, 14 insertions, 48 deletions
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index 44f5d4dc55..df1b98940a 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.70 2016/09/08 18:24:08 jmc Exp $
+.\" $OpenBSD: openssl.1,v 1.71 2016/09/12 13:34:12 jmc Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: September 8 2016 $
+.Dd $Mdocdate: September 12 2016 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -4553,68 +4553,34 @@ An error occurred decrypting or verifying the message.
 .It 5
 An error occurred writing certificates.
 .El
-.\"
-.\" SPEED
-.\"
 .Sh SPEED
 .nr nS 1
 .Nm "openssl speed"
-.Bk -words
+.Op Ar algorithm
-.Op Cm aes
-.Op Cm aes-128-cbc
-.Op Cm aes-192-cbc
-.Op Cm aes-256-cbc
-.Op Cm aes-128-gcm
-.Op Cm aes-256-gcm
-.Op Cm blowfish
-.Op Cm bf-cbc
-.Op Cm cast
-.Op Cm cast-cbc
-.Op Cm chacha20-poly1305
-.Op Cm des
-.Op Cm des-cbc
-.Op Cm des-ede3
-.Op Cm dsa
-.Op Cm dsa512
-.Op Cm dsa1024
-.Op Cm dsa2048
-.Op Cm hmac
-.Op Cm md4
-.Op Cm md5
-.Op Cm rc2
-.Op Cm rc2-cbc
-.Op Cm rc4
-.Op Cm rmd160
-.Op Cm rsa
-.Op Cm rsa512
-.Op Cm rsa1024
-.Op Cm rsa2048
-.Op Cm rsa4096
-.Op Cm sha1
 .Op Fl decrypt
 .Op Fl elapsed
-.Op Fl evp Ar e
+.Op Fl evp Ar algorithm
 .Op Fl mr
 .Op Fl multi Ar number
-.Ek
 .nr nS 0
 .Pp
 The
 .Nm speed
 command is used to test the performance of cryptographic algorithms.
 .Bl -tag -width "XXXX"
-.It Bq Cm zero or more test algorithms
+.It Ar algorithm
-If any options are given,
+Perform the test using
-.Nm speed
+.Ar algorithm .
-tests those algorithms, otherwise all of the above are tested.
+The default is to test all algorithms.
 .It Fl decrypt
-Time decryption instead of encryption
+Time decryption instead of encryption;
-.Pq only EVP .
+must be used with
+.Fl evp .
 .It Fl elapsed
 Measure time in real time instead of CPU user time.
-.It Fl evp Ar e
+.It Fl evp Ar algorithm
-Use EVP
+Perform the test using one of the algorithms accepted by
-.Ar e .
+.Xr EVP_get_cipherbyname 3 .
 .It Fl mr
 Produce machine readable output.
 .It Fl multi Ar number

diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1 index 44f5d4dc55..df1b98940a 100644 --- a/src/usr.bin/openssl/openssl.1 +++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: openssl.1,v 1.70 2016/09/08 18:24:08 jmc Exp $	1	.\" $OpenBSD: openssl.1,v 1.71 2016/09/12 13:34:12 jmc Exp $
2	.\" ====================================================================	2	.\" ====================================================================
3	.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.	3	.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4	.\"	4	.\"
@@ -112,7 +112,7 @@
112	.\"	112	.\"
113	.\" OPENSSL	113	.\" OPENSSL
114	.\"	114	.\"
115	.Dd $Mdocdate: September 8 2016 $	115	.Dd $Mdocdate: September 12 2016 $
116	.Dt OPENSSL 1	116	.Dt OPENSSL 1
117	.Os	117	.Os
118	.Sh NAME	118	.Sh NAME
@@ -4553,68 +4553,34 @@ An error occurred decrypting or verifying the message.
4553	.It 5	4553	.It 5
4554	An error occurred writing certificates.	4554	An error occurred writing certificates.
4555	.El	4555	.El
4556	.\"
4557	.\" SPEED
4558	.\"
4559	.Sh SPEED	4556	.Sh SPEED
4560	.nr nS 1	4557	.nr nS 1
4561	.Nm "openssl speed"	4558	.Nm "openssl speed"
4562	.Bk -words	4559	.Op Ar algorithm
4563	.Op Cm aes
4564	.Op Cm aes-128-cbc
4565	.Op Cm aes-192-cbc
4566	.Op Cm aes-256-cbc
4567	.Op Cm aes-128-gcm
4568	.Op Cm aes-256-gcm
4569	.Op Cm blowfish
4570	.Op Cm bf-cbc
4571	.Op Cm cast
4572	.Op Cm cast-cbc
4573	.Op Cm chacha20-poly1305
4574	.Op Cm des
4575	.Op Cm des-cbc
4576	.Op Cm des-ede3
4577	.Op Cm dsa
4578	.Op Cm dsa512
4579	.Op Cm dsa1024
4580	.Op Cm dsa2048
4581	.Op Cm hmac
4582	.Op Cm md4
4583	.Op Cm md5
4584	.Op Cm rc2
4585	.Op Cm rc2-cbc
4586	.Op Cm rc4
4587	.Op Cm rmd160
4588	.Op Cm rsa
4589	.Op Cm rsa512
4590	.Op Cm rsa1024
4591	.Op Cm rsa2048
4592	.Op Cm rsa4096
4593	.Op Cm sha1
4594	.Op Fl decrypt	4560	.Op Fl decrypt
4595	.Op Fl elapsed	4561	.Op Fl elapsed
4596	.Op Fl evp Ar e	4562	.Op Fl evp Ar algorithm
4597	.Op Fl mr	4563	.Op Fl mr
4598	.Op Fl multi Ar number	4564	.Op Fl multi Ar number
4599	.Ek
4600	.nr nS 0	4565	.nr nS 0
4601	.Pp	4566	.Pp
4602	The	4567	The
4603	.Nm speed	4568	.Nm speed
4604	command is used to test the performance of cryptographic algorithms.	4569	command is used to test the performance of cryptographic algorithms.
4605	.Bl -tag -width "XXXX"	4570	.Bl -tag -width "XXXX"
4606	.It Bq Cm zero or more test algorithms	4571	.It Ar algorithm
4607	If any options are given,	4572	Perform the test using
4608	.Nm speed	4573	.Ar algorithm .
4609	tests those algorithms, otherwise all of the above are tested.	4574	The default is to test all algorithms.
4610	.It Fl decrypt	4575	.It Fl decrypt
4611	Time decryption instead of encryption	4576	Time decryption instead of encryption;
4612	.Pq only EVP .	4577	must be used with
		4578	.Fl evp .
4613	.It Fl elapsed	4579	.It Fl elapsed
4614	Measure time in real time instead of CPU user time.	4580	Measure time in real time instead of CPU user time.
4615	.It Fl evp Ar e	4581	.It Fl evp Ar algorithm
4616	Use EVP	4582	Perform the test using one of the algorithms accepted by
4617	.Ar e .	4583	.Xr EVP_get_cipherbyname 3 .
4618	.It Fl mr	4584	.It Fl mr
4619	Produce machine readable output.	4585	Produce machine readable output.
4620	.It Fl multi Ar number	4586	.It Fl multi Ar number