diff options
| author | Damien Miller <djm@mindrot.org> | 2011-08-05 22:17:30 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-08-05 22:17:30 +0200 |
| commit | 20bd4535c01f4a47f535d6e4dc84420a6c5425a5 (patch) | |
| tree | 286fecc890f7799e26b68c08d9f2436b448bbc55 /ssh.1 | |
| parent | - markus@cvs.openbsd.org 2011/08/01 19:18:15 (diff) | |
| download | openssh-20bd4535c01f4a47f535d6e4dc84420a6c5425a5.tar.xz openssh-20bd4535c01f4a47f535d6e4dc84420a6c5425a5.zip | |
- djm@cvs.openbsd.org 2011/08/02 01:22:11
[mac.c myproposal.h ssh.1 ssh_config.5 sshd.8 sshd_config.5]
Add new SHA256 and SHA512 based HMAC modes from
http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt
Patch from mdb AT juniper.net; feedback and ok markus@
Diffstat (limited to 'ssh.1')
| -rw-r--r-- | ssh.1 | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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.1,v 1.319 2011/05/07 23:20:25 jmc Exp $ -.Dd $Mdocdate: May 7 2011 $ +.\" $OpenBSD: ssh.1,v 1.320 2011/08/02 01:22:11 djm Exp $ +.Dd $Mdocdate: August 2 2011 $ .Dt SSH 1 .Os .Sh NAME @@ -667,7 +667,9 @@ Both protocols support similar authentication methods, but protocol 2 is the default since it provides additional mechanisms for confidentiality (the traffic is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour) -and integrity (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160). +and integrity (hmac-md5, hmac-sha1, +hmac-sha2-256, hmac-sha2-512, +umac-64, hmac-ripemd160). Protocol 1 lacks a strong mechanism for ensuring the integrity of the connection. .Pp |