diff options
| author |   jsg <jsg@openbsd.org> | 2015-04-21 07:01:00 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2015-04-21 07:01:00 +0000 |
| commit | d24a9401167c05cfcd60fd7a70f8e06455ceaa0c (patch) | |
| tree | eaa6492bea8420957048a81738dfb6ce411442c5 | |
| parent | Remove a duplicate variable and #define that snuck in, in a previous (diff) | |
| download | wireguard-openbsd-d24a9401167c05cfcd60fd7a70f8e06455ceaa0c.tar.xz wireguard-openbsd-d24a9401167c05cfcd60fd7a70f8e06455ceaa0c.zip | |
Add back a backslash removed in rev 1.42 so KEX_SERVER_ENCRYPT will
include aes again.
ok deraadt@
| -rw-r--r-- | usr.bin/ssh/myproposal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h index 6f962b25962..e09f4c3cd72 100644 --- a/usr.bin/ssh/myproposal.h +++ b/usr.bin/ssh/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.42 2015/03/24 09:17:21 djm Exp $ */ +/* $OpenBSD: myproposal.h,v 1.43 2015/04/21 07:01:00 jsg Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -95,7 +95,7 @@ "ssh-ed25519-cert-v01@openssh.com," \ "ssh-ed25519" #define KEX_SERVER_ENCRYPT \ - "chacha20-poly1305@openssh.com," + "chacha20-poly1305@openssh.com," \ "aes128-ctr,aes192-ctr,aes256-ctr" #define KEX_SERVER_MAC \ "umac-64-etm@openssh.com," \ |