diff options
| author | des <des@FreeBSD.org> | 2013-03-22 17:55:38 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-03-22 17:55:38 +0000 |
| commit | b291eafe8d40c45b908e0f6481f471ca44a0a2f8 (patch) | |
| tree | dd7d7e2bece2a6008e83b0bf90e7410032c4be13 /crypto/openssh/myproposal.h | |
| parent | 19db167f418891cf677735a56370ffbcbdb37d67 (diff) | |
| parent | 5a4dbb83324b0cc6594abbb5fcaa8fe0415febc5 (diff) | |
| download | FreeBSD-src-b291eafe8d40c45b908e0f6481f471ca44a0a2f8.zip FreeBSD-src-b291eafe8d40c45b908e0f6481f471ca44a0a2f8.tar.gz | |
Upgrade to OpenSSH 6.2p1. The most important new features are support
for a key revocation list and more fine-grained authentication control.
Diffstat (limited to 'crypto/openssh/myproposal.h')
| -rw-r--r-- | crypto/openssh/myproposal.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/crypto/openssh/myproposal.h b/crypto/openssh/myproposal.h index 876b016..26e0029 100644 --- a/crypto/openssh/myproposal.h +++ b/crypto/openssh/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.29 2012/06/28 05:07:45 dtucker Exp $ */ +/* $OpenBSD: myproposal.h,v 1.32 2013/01/08 18:49:04 markus Exp $ */ /* $FreeBSD$ */ /* @@ -74,6 +74,7 @@ #define KEX_DEFAULT_ENCRYPT \ "aes128-ctr,aes192-ctr,aes256-ctr," \ "arcfour256,arcfour128," \ + "aes128-gcm@openssh.com,aes256-gcm@openssh.com," \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" #ifdef NONE_CIPHER_ENABLED @@ -88,9 +89,19 @@ # define SHA2_HMAC_MODES #endif #define KEX_DEFAULT_MAC \ + "hmac-md5-etm@openssh.com," \ + "hmac-sha1-etm@openssh.com," \ + "umac-64-etm@openssh.com," \ + "umac-128-etm@openssh.com," \ + "hmac-sha2-256-etm@openssh.com," \ + "hmac-sha2-512-etm@openssh.com," \ + "hmac-ripemd160-etm@openssh.com," \ + "hmac-sha1-96-etm@openssh.com," \ + "hmac-md5-96-etm@openssh.com," \ "hmac-md5," \ "hmac-sha1," \ "umac-64@openssh.com," \ + "umac-128@openssh.com," \ SHA2_HMAC_MODES \ "hmac-ripemd160," \ "hmac-ripemd160@openssh.com," \ |
