===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/openssl.1,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- src/usr.bin/openssl/openssl.1	2016/09/08 18:24:08	1.70
+++ src/usr.bin/openssl/openssl.1	2016/09/12 13:34:12	1.71
@@ -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 @@
 .It 5
 An error occurred writing certificates.
 .El
-.\"
-.\" SPEED
-.\"
 .Sh SPEED
 .nr nS 1
 .Nm "openssl speed"
-.Bk -words
-.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 Ar algorithm
 .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
-If any options are given,
-.Nm speed
-tests those algorithms, otherwise all of the above are tested.
+.It Ar algorithm
+Perform the test using
+.Ar algorithm .
+The default is to test all algorithms.
 .It Fl decrypt
-Time decryption instead of encryption
-.Pq only EVP .
+Time decryption instead of encryption;
+must be used with
+.Fl evp .
 .It Fl elapsed
 Measure time in real time instead of CPU user time.
-.It Fl evp Ar e
-Use EVP
-.Ar e .
+.It Fl evp Ar algorithm
+Perform the test using one of the algorithms accepted by
+.Xr EVP_get_cipherbyname 3 .
 .It Fl mr
 Produce machine readable output.
 .It Fl multi Ar number