diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
commit | 2ea3f720daeb1ca9f765365fce3a9546961fe624 (patch) | |
tree | c4fb7d1f51fa51e7677232de806aae150e29e2ac /sshd.8 | |
parent | f5efcd3450bbf8261915e0c4a6f851229dddaa79 (diff) | |
parent | ecebda56da46a03dafff923d91c382f31faa9eec (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.2).
- Add support for multiple required authentication in SSH protocol 2 via
an AuthenticationMethods option (closes: #195716).
- Fix Sophie Germain formula in moduli(5) (closes: #698612).
- Update ssh-copy-id to Phil Hands' greatly revised version (closes:
#99785, #322228, #620428; LP: #518883, #835901, #1074798).
Diffstat (limited to 'sshd.8')
-rw-r--r-- | sshd.8 | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd.8,v 1.266 2012/06/18 12:07:07 dtucker Exp $ | 36 | .\" $OpenBSD: sshd.8,v 1.267 2012/10/04 13:21:50 markus Exp $ |
37 | .Dd $Mdocdate: June 18 2012 $ | 37 | .Dd $Mdocdate: October 4 2012 $ |
38 | .Dt SSHD 8 | 38 | .Dt SSHD 8 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -319,7 +319,7 @@ The client selects the encryption algorithm | |||
319 | to use from those offered by the server. | 319 | to use from those offered by the server. |
320 | Additionally, session integrity is provided | 320 | Additionally, session integrity is provided |
321 | through a cryptographic message authentication code | 321 | through a cryptographic message authentication code |
322 | (hmac-md5, hmac-sha1, umac-64, hmac-ripemd160, | 322 | (hmac-md5, hmac-sha1, umac-64, umac-128, hmac-ripemd160, |
323 | hmac-sha2-256 or hmac-sha2-512). | 323 | hmac-sha2-256 or hmac-sha2-512). |
324 | .Pp | 324 | .Pp |
325 | Finally, the server and the client enter an authentication dialog. | 325 | Finally, the server and the client enter an authentication dialog. |