diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /ssh.0 | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'ssh.0')
-rw-r--r-- | ssh.0 | 57 |
1 files changed, 36 insertions, 21 deletions
@@ -396,8 +396,8 @@ AUTHENTICATION | |||
396 | since it provides additional mechanisms for confidentiality (the traffic | 396 | since it provides additional mechanisms for confidentiality (the traffic |
397 | is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour) and | 397 | is encrypted using AES, 3DES, Blowfish, CAST128, or Arcfour) and |
398 | integrity (hmac-md5, hmac-sha1, hmac-sha2-256, hmac-sha2-512, umac-64, | 398 | integrity (hmac-md5, hmac-sha1, hmac-sha2-256, hmac-sha2-512, umac-64, |
399 | hmac-ripemd160). Protocol 1 lacks a strong mechanism for ensuring the | 399 | umac-128, hmac-ripemd160). Protocol 1 lacks a strong mechanism for |
400 | integrity of the connection. | 400 | ensuring the integrity of the connection. |
401 | 401 | ||
402 | The methods available for authentication are: GSSAPI-based | 402 | The methods available for authentication are: GSSAPI-based |
403 | authentication, host-based authentication, public key authentication, | 403 | authentication, host-based authentication, public key authentication, |
@@ -537,6 +537,12 @@ ESCAPE CHARACTERS | |||
537 | ~R Request rekeying of the connection (only useful for SSH protocol | 537 | ~R Request rekeying of the connection (only useful for SSH protocol |
538 | version 2 and if the peer supports it). | 538 | version 2 and if the peer supports it). |
539 | 539 | ||
540 | ~V Decrease the verbosity (LogLevel) when errors are being written | ||
541 | to stderr. | ||
542 | |||
543 | ~v Increase the verbosity (LogLevel) when errors are being written | ||
544 | to stderr. | ||
545 | |||
540 | TCP FORWARDING | 546 | TCP FORWARDING |
541 | Forwarding of arbitrary TCP connections over the secure channel can be | 547 | Forwarding of arbitrary TCP connections over the secure channel can be |
542 | specified either on the command line or in a configuration file. One | 548 | specified either on the command line or in a configuration file. One |
@@ -862,36 +868,45 @@ SEE ALSO | |||
862 | scp(1), sftp(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), ssh-keyscan(1), | 868 | scp(1), sftp(1), ssh-add(1), ssh-agent(1), ssh-keygen(1), ssh-keyscan(1), |
863 | tun(4), hosts.equiv(5), ssh_config(5), ssh-keysign(8), sshd(8) | 869 | tun(4), hosts.equiv(5), ssh_config(5), ssh-keysign(8), sshd(8) |
864 | 870 | ||
865 | The Secure Shell (SSH) Protocol Assigned Numbers, RFC 4250, 2006. | 871 | STANDARDS |
872 | S. Lehtinen and C. Lonvick, The Secure Shell (SSH) Protocol Assigned | ||
873 | Numbers, RFC 4250, January 2006. | ||
866 | 874 | ||
867 | The Secure Shell (SSH) Protocol Architecture, RFC 4251, 2006. | 875 | T. Ylonen and C. Lonvick, The Secure Shell (SSH) Protocol Architecture, |
876 | RFC 4251, January 2006. | ||
868 | 877 | ||
869 | The Secure Shell (SSH) Authentication Protocol, RFC 4252, 2006. | 878 | T. Ylonen and C. Lonvick, The Secure Shell (SSH) Authentication Protocol, |
879 | RFC 4252, January 2006. | ||
870 | 880 | ||
871 | The Secure Shell (SSH) Transport Layer Protocol, RFC 4253, 2006. | 881 | T. Ylonen and C. Lonvick, The Secure Shell (SSH) Transport Layer |
882 | Protocol, RFC 4253, January 2006. | ||
872 | 883 | ||
873 | The Secure Shell (SSH) Connection Protocol, RFC 4254, 2006. | 884 | T. Ylonen and C. Lonvick, The Secure Shell (SSH) Connection Protocol, RFC |
885 | 4254, January 2006. | ||
874 | 886 | ||
875 | Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints, RFC | 887 | J. Schlyter and W. Griffin, Using DNS to Securely Publish Secure Shell |
876 | 4255, 2006. | 888 | (SSH) Key Fingerprints, RFC 4255, January 2006. |
877 | 889 | ||
878 | Generic Message Exchange Authentication for the Secure Shell Protocol | 890 | F. Cusack and M. Forssen, Generic Message Exchange Authentication for the |
879 | (SSH), RFC 4256, 2006. | 891 | Secure Shell Protocol (SSH), RFC 4256, January 2006. |
880 | 892 | ||
881 | The Secure Shell (SSH) Session Channel Break Extension, RFC 4335, 2006. | 893 | J. Galbraith and P. Remaker, The Secure Shell (SSH) Session Channel Break |
894 | Extension, RFC 4335, January 2006. | ||
882 | 895 | ||
883 | The Secure Shell (SSH) Transport Layer Encryption Modes, RFC 4344, 2006. | 896 | M. Bellare, T. Kohno, and C. Namprempre, The Secure Shell (SSH) Transport |
897 | Layer Encryption Modes, RFC 4344, January 2006. | ||
884 | 898 | ||
885 | Improved Arcfour Modes for the Secure Shell (SSH) Transport Layer | 899 | B. Harris, Improved Arcfour Modes for the Secure Shell (SSH) Transport |
886 | Protocol, RFC 4345, 2006. | 900 | Layer Protocol, RFC 4345, January 2006. |
887 | 901 | ||
888 | Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer | 902 | M. Friedl, N. Provos, and W. Simpson, Diffie-Hellman Group Exchange for |
889 | Protocol, RFC 4419, 2006. | 903 | the Secure Shell (SSH) Transport Layer Protocol, RFC 4419, March 2006. |
890 | 904 | ||
891 | The Secure Shell (SSH) Public Key File Format, RFC 4716, 2006. | 905 | J. Galbraith and R. Thayer, The Secure Shell (SSH) Public Key File |
906 | Format, RFC 4716, November 2006. | ||
892 | 907 | ||
893 | Elliptic Curve Algorithm Integration in the Secure Shell Transport Layer, | 908 | D. Stebila and J. Green, Elliptic Curve Algorithm Integration in the |
894 | RFC 5656, 2009. | 909 | Secure Shell Transport Layer, RFC 5656, December 2009. |
895 | 910 | ||
896 | A. Perrig and D. Song, Hash Visualization: a New Technique to improve | 911 | A. Perrig and D. Song, Hash Visualization: a New Technique to improve |
897 | Real-World Security, 1999, International Workshop on Cryptographic | 912 | Real-World Security, 1999, International Workshop on Cryptographic |
@@ -904,4 +919,4 @@ AUTHORS | |||
904 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 919 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
905 | versions 1.5 and 2.0. | 920 | versions 1.5 and 2.0. |
906 | 921 | ||
907 | OpenBSD 5.2 June 18, 2012 OpenBSD 5.2 | 922 | OpenBSD 5.3 October 4, 2012 OpenBSD 5.3 |