summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh_config.5
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2012-06-28 05:07:46 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2012-06-28 05:07:46 +0000
commit37506ca84866a2d113fc1244ba2a52855bbbf11c (patch)
tree79ed11d53adddd7ed44943e8ff3d177d86ed5d61 /usr.bin/ssh/ssh_config.5
parent8b17b0be4ce3faf2c60fd8a80e8cd1c60901932e (diff)
Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed
from draft6 of the spec and will not be in the RFC when published. Patch from mdb at juniper net via bz#2023, ok markus.
Diffstat (limited to 'usr.bin/ssh/ssh_config.5')
-rw-r--r--usr.bin/ssh/ssh_config.57
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index c9917d25b65..db7ea5cddd5 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.155 2012/06/18 11:49:58 dtucker Exp $
-.Dd $Mdocdate: June 18 2012 $
+.\" $OpenBSD: ssh_config.5,v 1.156 2012/06/28 05:07:45 dtucker Exp $
+.Dd $Mdocdate: June 28 2012 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -794,8 +794,7 @@ The default is:
.Bd -literal -offset indent
hmac-md5,hmac-sha1,umac-64@openssh.com,
hmac-ripemd160,hmac-sha1-96,hmac-md5-96,
-hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,
-hmac-sha2-512-96
+hmac-sha2-256,hmac-sha2-512
.Ed
.It Cm NoHostAuthenticationForLocalhost
This option can be used if the home directory is shared across machines.